4.0: Candidates for corrective releases #114706

New Issue

Thomas Dinges · 2023-11-10T15:05:59+01:00

Thomas Dinges commented

2023-11-10 15:05:59 +01:00

Candidates to backport

Developers: Please add candidates here, i.e. commits in main that need to be back-ported to the release branch. Backports are done by the release team (Thomas & Philipp).

This task tracks Blender itself as well as addons.

Report	Commits in main	Remarks
#115830	`79ed05b29f`
#115716:	`35b9e37295`
#115683	`f489b84316`
#115366	`eb399678f5`
#114760	`481094ff5c`
#114838	`f3c1111836`
	blender/blender-addons@62b9a6c9da	Not sure it will merge without conflict. I can create a PR if needed
	blender/blender-addons@e936f80134	Not sure it will merge without conflict. I can create a PR if needed
#116022	`460439acba`
#112180	`d98005da5d`
#115590	`f83180370a`
	`b840ba1f59`
#116193	`c23b51d614`	Revealed by `b840ba1f59`.
#115486	`60a9c8ee25`
#116215	`7346727cfc`
blender/blender-addons#105045	blender/blender-addons@f21b90cbab	Use blender/blender-addons!105053
#115086	`4e10aa6e71`
#114630	`9f0b4344ac`
blender/blender-addons#105075	blender/blender-addons@63da8ac3f9	trivial fix for the Rigify metarig upgrade operator
#116614	`c428b5871c`
#115938	`76bf43f44d`

Blender 4.0.3 (no further release)

Report	Commits in main	Commits in blender-v4.0-release
#115253	`8582a1fcf1`	`3eaf2b2e50`
#116280	`0681180413`	`63e9cead5f`
	`d2e91fb0d7`	`f753cf14fc`

Blender 4.0.2 (released December 6)

Report	Commits in main	Commits in blender-v4.0-release	Remarks
#114918:	`f27e87db7a`	`beca339ecb`
	`6207b83194`	`fe904e9ff9`	Avoids long wait times of compile-gpu step
		`a33d2ce7bf`
		`641b7808f2`
		`90d4364b35`
		`175991df4f`
	`d94281d7af`	`6f625cedf1`	See also !114784
#114963	`7f33a743d8`	`41e1836dbb`
#113325	`697114c4b6`	`62c0342e75`
#115025	`bf7d4ef054`	`4441be6c47`
#114742	`4dc1c23384`	`3284c0a20d`
#115105	`85ffb71e44`	`478a15d7ef`
#115153	`07b5e1bd80`, `cea7b0bde8`	`521feea0f2`, `463f804555`	first commit broke Set Snap Base #115393
#115007	`918515495e`	`ed1d099cff`
	`d0e9468848`, `5118f6f573`	`4d0de9022f`, `9d981a2d94`
#114596	`8643383b29`	`4c6879bc8b`
#115151	`f0f378d31e`, `c0b8773a2b`	`a689d8416a`, `b8989fe029`
#115279	`a13696a242`	`b4ee1e81ba`
#115228	`9cb2394d7a`	`80ac292318`
blender/blender-addons#105026	blender/blender-addons@400cda6f4f	blender/blender-addons@3ddbecd112
#114982		`eb42fd543e`	Revert of `b1526dd2c6`. PR with proper fix for main is !115079
	`16e269863`	`6d324dbaec`	merge conflicts (VSE: fixed strips offsets not being rendered)
#115144	`ae1e2951c7`	`cde438df81`
	blender/blneder-addons@2c32cc163f	blender/blender-addons@db7a31b51f	Used blender/blender-addons!105030
#115206	`59a1148ac0`	`297fd23114`
#115471	`451a765ab3`	`2e832d7db0`
#115363	`09be0915c3`	`1cf65db158`
#115140	`a4b8d214c6`	`3b3c4c4b3b`
#115160	`258a083066`	`a3ec8b071f`
#115570	`db3d59d94d`	`f36ed0ff4b`
#115572	`d3ff658b66`	`3a26317551`
#115056	`5486c70aae`	`ca8a168565`
#115181	`09bd046975`	`30e50a8b68`
#114609	`a226b14984`	`5204839312`
#115037	`864b07011a`	`570ce131c0`
#115526	`6023a6a423`	`feda674314`
#115090	`2e1486da60`	`324e6ca147`	Conflicts, resolved in PR !115702.
#113059	`e6c200e94c` & `36351f3796`	`84ea37345a`	Conflicts, resolved in PR !115705.
blender/blender-addons#105028	blender/blender-addons@c79c97b774	blender/blender-addons@6d59284fc0
blender/blender-addons#105040	blender/blender-addons@dff97f88ed	blender/blender-addons@7e760cb90e
#115715	`c9dd5ce4cc`	`d07d0e632b`

Blender 4.0.1 (Released on November 17)

Report	Commits in main	Commits in blender-v4.0-release	Remarks
#114841	`1a8b5bcd43`	`a702784e6f`
#114855	`5c04b477aa`	`3005614c8d`
#114919	`0334ca0617`	`6b7e81334d`
#114891	`bfe6128748`, `5ef5567b82`	`681a3ec5af`, `cff90e5b4a`
#114758	`920d9a9165`	`52678afa4f`
#114906	`a277ca3d3d`	`992234e0ad`
#114892	`578b479998`	`0a8a631d7a`
#114661	`fa0d3d2b58`	`d1b619aa1c`
#114848	`4ee531cf26`	`be1f8bf4e4`
	blender/blender-addons@75c8369bbd	blender/blender-addons@e5ad2e2c16	Merge conflict solved in version number
blender/blender-addons#104999	blender/blender-addons@73696ba54a	blender/blender-addons@ba9b91b2d8

Thomas Dinges added this to the 4.0 milestone 2023-11-10 15:05:59 +01:00

Thomas Dinges added the

Type

To Do

label 2023-11-10 15:05:59 +01:00

Thomas Dinges referenced this issue

2023-11-15 12:06:30 +01:00

Use wm.search_menu to add search node shortcut keys, and the search dialog box will retain the last search results. #114904

Thomas Barlow commented

2023-11-26 19:33:10 +01:00

Can blender/blender-addons@2c32cc163f (fix FBX import of shape key animations without any keyframes) be added to the backport candidates please? cc: @mont29

Can blender/blender-addons@2c32cc163fbd958449de1e8260712103ff316d72 (fix FBX import of shape key animations without any keyframes) be added to the backport candidates please? cc: @mont29

Bastien Montagne commented

2023-11-27 10:44:49 +01:00

@Mysteryem makes sense, but think it's be better to have this one as a PR on 4.0 branch, since e.g. the bl_info data most likely will conflict?

@Mysteryem makes sense, but think it's be better to have this one as a PR on 4.0 branch, since e.g. the `bl_info` data most likely will conflict?

Thomas Barlow commented

2023-11-27 16:08:49 +01:00

@Mysteryem makes sense, but think it's be better to have this one as a PR on 4.0 branch, since e.g. the bl_info data most likely will conflict?

Sure, I've created a PR for the backport with the bl_info conflicts resolved: blender/blender-addons#105030

> @Mysteryem makes sense, but think it's be better to have this one as a PR on 4.0 branch, since e.g. the `bl_info` data most likely will conflict? Sure, I've created a PR for the backport with the `bl_info` conflicts resolved: https://projects.blender.org/blender/blender-addons/pulls/105030

👍 1

Bastien Montagne commented

2023-11-27 16:51:41 +01:00

Thanks, added to the list of TODO backports