media/blender
media/blender
1
0
Fork 0
mirror of https://projects.blender.org/blender/blender.git synced 2024-10-18 05:53:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse source
This commit is contained in:
Campbell Barton 2024-10-17 09:51:20 +11:00
parent 2d832240a3 46864bc2f4
commit 233d213ee9
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
AUTHORS
View file

@ -150,7 +150,7 @@ Cheryl Chen <chnchryl>
Chingiz Dyussenov <chingiz.ds@gmail.com>
Chris Blackbourn <chrisbblend@gmail.com>
Chris Burt <desoto@exenex.com>
Chris Clyne <lateasusual>
Chris Clyne <chris@lateasusual.com>
Chris Want <cwant@ualberta.ca>
Christian Brinkmann <hallo@zblur.de>
Christian Friedrich <rbx775>
@ -640,6 +640,7 @@ Scott Petrovic <scottpetrovic@gmail.com>
Scott Spadea <scottspadea>
Scott Wilson <propersquid>
Scurest <scurest>
Sean <seantommurray@gmail.com>
Sean Kim <SeanCTKim@protonmail.com>
Sebastian Herholz <sebastian.herholz@intel.com>
Sebastian Koenig <sebastiankoenig@posteo.de>
@ -691,7 +692,7 @@ Thibault de Villèle <thibaulltt>
Thomas Barlow <github@mysterymayhem.co.uk>
Thomas Beck <software@plasmasolutions.de>
Thomas Dinges <thomas@blender.org>
Thomas Lachmann <TL>
Thomas Lachmann <tl@bunker-werk.net>
Thomas Szepe <HG1_public@gmx.net>
Thomas Wilshaw <thomaswilshaw@gmail.com>
Tiago Chaves <laurelkeys>

6
tools/utils/authors_git_gen.py
View file

@ -294,6 +294,9 @@ class Credits:
self.write_object(fh, use_metadata=use_metadata)
# -----------------------------------------------------------------------------
# Argument Parser
def argparse_create() -> argparse.ArgumentParser:
# When --help or no args are given, print this help
@ -351,6 +354,9 @@ def argparse_create() -> argparse.ArgumentParser:
return parser
# -----------------------------------------------------------------------------
# Main Function
def main() -> None:
# ----------

14
tools/utils/git_data_canonical_authors.py
View file

@ -41,6 +41,7 @@ def canonical_author_map() -> Dict[str, str]:
),
"Alaska <alaskayou01@gmail.com>": (
"Alaska <Alaska>",
"Alaska <Alaskayou01@gmail.com>",
"Alaska <alaska@noreply.localhost>",
),
"Aleksandr Zinovev <roaoao@gmail.com>": (
@ -157,6 +158,9 @@ def canonical_author_map() -> Dict[str, str]:
"Charlie Jolly <charlie>",
"charlie <mistajolly@gmail.com>",
),
"Chris Clyne <chris@lateasusual.com>": (
"Chris Clyne <lateasusual>",
),
"Christian Brinkmann <hallo@zblur.de>": (
"christian brinkmann <>",
),
@ -650,6 +654,9 @@ def canonical_author_map() -> Dict[str, str]:
"Scurest <scurest@noreply.localhost>",
"scurest <scurest@users.noreply.github.com>",
),
"Sean <seantommurray@gmail.com>": (
"sean-murray <sean-murray@noreply.localhost>",
),
"Sean Kim <SeanCTKim@protonmail.com>": (
"Sean Kim <sean-kim@noreply.localhost>",
),
@ -710,7 +717,7 @@ def canonical_author_map() -> Dict[str, str]:
"Sun Kim <persun@noreply.localhost>",
),
"Sybren A. Stüvel <sybren@blender.org>": (
"Sybren A. StÃ\x83¼vel <sybren@stuvel.eu>",
"Sybren A. St\xC3\x83\xC2\xBCvel <sybren@stuvel.eu>",
"Sybren A. Stüvel <sybren>",
"Sybren A. Stüvel <sybren@stuvel.eu>",
),
@ -719,6 +726,9 @@ def canonical_author_map() -> Dict[str, str]:
"Thomas Dinges <dingto>",
"Thomas Dinges <thomasdinges@noreply.localhost>",
),
"Thomas Lachmann <tl@bunker-werk.net>": (
"Thomas Lachmann <TL>",
),
"Thomas Szepe <HG1_public@gmx.net>": (
"HG1 <HG1_public@gmx.net>",
),
@ -748,7 +758,7 @@ def canonical_author_map() -> Dict[str, str]:
"Vitor Boschi da Silva <vitorboschi>"
),
"Vuk Gardašević <lijenstina>": (
"Vuk GardaÅ¡eviÄ\x87 <lijenstina>",
"Vuk Garda\xC5¡evi\xC4\x87 <lijenstina>",
),
"Wannes Malfait <wannes.malfait@gmail.com>": (
"Wannes Malfait <Wannes>",