Blender LTS: Maintenance Task 3.6 #109399

New Issue

This task is a management task to track the commits and fixes that will be or are already applied to Blender 3.6 rolling release. The process is documented on https://wiki.blender.org/wiki/User:Jbakker/projects/BlenderLTS/ProcessDescription

NOTE: When changing this task please make sure to stick to the markup. The description is parsed to generate the release notes.

Final commit of initial release:
Last merge of blender-v3.6-release to main:
Last checked commit in main:

To Be Backported

NOTE: When adding commits please add the repository prefix to it. The release note generator requires the prefix.

NOTE: When adding items, please add them to the bottom of the To Be Backported list (not the Blender 3.6.1 list).

NOTE: please leave a remark if a particular commit needs library updates in the branch, e.g. #109771

NOTE: commits are checked for having followup-issues (skipped for release in that case), if there are other reasons a commit should not be in a particular release, please also leave a remark (or remove the commit from the list again)

Report	Commits in `main`	Remarks
#111028	`3f1674ef52`	was a duplicate of blender/blender-addons#104723 [which is in 3.6.3]
	`2549272f02`	conflicts, assume this needs additional prior commit(s)?
#110204	`c275f4219f`	conflicts because of `4f3e2ee857`, might not be backported
#111779	`30e3caaf82`	conflicts because of `1b4b90f5f7`, might not be backported, would also need `e924f316a7`
#109906	`d4cc0d0`	Wait to backport until 3.6.4, for user feedback
#110724	`89b3249`	Wait to backport until 3.6.4, for user feedback
#110108	`bd305c8d18`	conflicts, also needs `4033f3bcc3` ?
	`5ae99270c1`
	`b9124d8a85`	!112470 (PR as it conflicts).
	`66028c8c97`	!112492 (PR is a simplified fix to avoid depending new functions).
#100596	`954ae19b2b` and `f6082a5042`
#97628	`057de815ef`
#105196	`d102536b1a`
	blender/blender-addons@1467d62c79

Blender 3.6.4

Report	Commits in `main`	Commits in LTS	Remarks
	`211d631428`	`fa6261e53a`	follow up from `56781c80b7`
#101550	`59e8be7aa4`	`8eafc4e1d4`	conflicts, resolved
#112397	`72624f9678`	`a5c5ec6052`
	`9d92f03536`	`d9ab0a3ef7`

Blender 3.6.3

Report	Commits in `main`	Commits in LTS	Remarks
#111235	N/A	`d9831a9a4b`	Only affecting LTS releases
	`b075c84ba3`	`5b6106f71a`
#110136	N/A	`56659f1510`	also fixed #110925, #109301, #109432
#111332	`7fb58a33f0`	`e2d4403497`	Cherry picked into `main` (conflicts, resolved)
		`2fc04eaf43`
#110721	`36cd1755d2`	`c5fd621240`
#110948	`3bf2757b47`	`19a16de5df`
	`a37ff68334`	`4cf03b28b3`	conflicts, resolved
#110789	`598af45459`	`481d4fdaa1`	conflicts, resolved
#110464	`dce2368b8c`, `931467cbd5`	`08bff72a0a`, `65f38fa010`	had folloup-issue
#110085	`c4fb34a3f7`	`c8573cb20a`
#111094	`769fe07668`	`d9f12d5453`
#110723	`4cefe0ec80`	`1e4b5e5a3b`
#109081	`391c2ea21c`	`b051ceb96b`
	`262b67d61d`	`5b7af751fa`	Used !110982
#111165		`452ec6c93e`	Used PR #111215
blender/blender-addons#104723	blender/blender-addons@35824c38e3	blender/blender-addons@a9b01e87
#110795	`e42c70fd31`	`3234da45a2`
#106976	`b1b8091667`, `83047bed26`	`63cad96833`, `f420dabf8e`	had followup commit, added as well
#111277	`7f65080ab4`	`ec1b417263`
	`9e71b84f1d`	`dd7f974936`
#111238	`8bae4427ed`	`1aceeac984`
#94129	`e2a35debde`	`5f2ead7db0`	conflicts, resolved
#109427	`b4c380acb4`	`557d3d7953`
#110508	`8d9422cfe3`, `3da47a6084`	`b9f78a0fcf`, `93cc31ab85`	conflicts, resolved, had followup commit, added as well
#111439	`110eb666ca`	`282038ea03`	conflicts, resolved
	`3f7eceea93`	`eb77eaa7d8`
#111601	`02406e17a0`	`c655db6185`
	`8992e7ab2a`	`8dd151debc`
	`ebd4d1e2d6`	`c3689c4235`	build errors, resolved
#111615	`0798aae01c`	`6d0d07f0d8`
#111490	`cc01bb83f6`	`af7df55c7d`	conflicts, resolved
#111548	`a0b232c80d`	`d371c3c09f`	conflicts, resolved
#109454	`c02f2f4947`	`ed8d18a3fc`	conflicts, resolved
#111933		`439e37466c`	Used !111958
#111273	`b6df32f740`	`d59c8d195b`	conflicts, used !112015
#109583	`580833165c`	`c8c6f62cf3`	conflicts, resolved
	`a3c045d49d`	`2a7d6d182c`
#111642	`f77fdbff8a`	`24484053f5`	conflicts, resolved
#111645	`4cf0e7acfb`	`f2fffc5390`
#111162	`09df1f4caf`	`0d557718eb`
#110161	`5b3398a673`	`2dd5d31946`	conflicts, resolved
#111593	`30114476c7`	`a786b2981e`
#109201	`8141ee90f4`	`3542d8ac06`
	`02736d28cd`	`b8ab67827d`
#109282	`6a301cf07f`	`6723a62c68`	conflicts, resolved
#111970	`00a36cbf24`	`e039442f27`	conflicts, resolved
#111820	`bf8d3c157a`	`8159bd90e5`
#112208	`84b4b90e08`	`c6998872f0`	conflicts, resolved
	`a370acae0c`	`9fc217cedf`	conflicts because of `0b7d8a20bf`, resolved
#112028	`397a0a0e7e`	`57a58fb2b3`
#112144	`52cfa67f6f`	`d06c761a9d`
#112285	`564716d5a2`	`588c793db0`
#109236	`f41dc90925`	`be2df46afe`	conflicts, resolved. large commit
#112184	`3b44fd3655`	`e2f9c9892e`	conflicts, resolved
#112068	`97d2dbb24e`	`d2b12579f0`	conflicts, , used !112366
#112335	`726bd3887f`	`672c16321b`
#111166	`11b2ac54a6`	`9464eb1682`	conflicts, resolved
#111411	`e914004678`	`c010263371`
#100718	`9da88301ef`	`8c8d1fba6e`	conflicts, used !112347
#112299	`42ed81b`	`ce77d52`
	`281fbf72f0`	`2e1ab36`
#112123		`048d4638af`	used !112360
	`101abc6f6c`	`eba0d481bb`
#111212	`56781c80b7`	`c106702bcc`

Blender 3.6.2

Report	Commits in `main`	Commits in LTS	Remarks
#99569	`fc58d92acb`	`bc486302fe`
#109630	`75658109be`	`ea8f8fd50a`
#109986	`0a2d4289c0`	`0a10b8e82a`
#110107	`d74b984467`	`4bb2402172`
#110021	`2cb9290012`	`a30bcc806d`
#93796	`a1a08610b6`	`273ba74fcb`
	`9ed5177055`	`8362d4aa3d`	Used fast-forward merge of !109704
	`4842424220`	`cb31546c03`	Used fast-forward merge of !109704
	`5b85248c71`	`db2d148239`	Used fast-forward merge of !109704
	`2dfbd653a0`	`11c57f3016`	Used fast-forward merge of !109704
	`a05419f18b`	`8736b6cc83`	Used fast-forward merge of !109704
	`8a45453a9b`	`a6df000206`	Used fast-forward merge of !109704
	`526dc2b58f`	`30943d710f`	Used fast-forward merge of !109704
	`684a0b20c3`	`cc325ad1ba`	Used fast-forward merge of !109704
	b404dbaccd	`f63ca4f7a8`	Used fast-forward merge of !109704
	`67bc7f9477`	`8c81327b84`	Used fast-forward merge of !109704
	`bf93fb0f46`	`4bc512bc9d`	Used fast-forward merge of !109704
#109886	`30d44548e3`	`ac24dc4cbb`
#109525	`65e8b21a95`	`0ac35f42de`
#40059	`b7a119c785`	`99f1ea5341`
	`308da08221`	`d47755f3c6`
#110164	`b199f10204`	`e7e54d6e16`
#109771	`ece704af45`	`4910653d5c`
	`b08b6984d0`	`0c4a357746`
#106139	`742ada97e2`	`ea66623801`
#110341	`126fd4a181`	`e4d429cfaf`
	`4fe7626c49`	`dca1dbbc6c`
#110336	`7c3a779bc2`	`420f2adb2a`
#110170	`0fab1f4f68`	`771bf05c73`
#110426	`b3223d3f4f`	`35b913af30`
#110512	`9a150b95c5`	`c66db95fba`
	`318aaa6d6b`
	`9ca57f266e`
#110259		`70a412d743`	Used PR !110263
#109720	`c6725b935c`	`90458c6400`	Used PR !110448
#109151	`0896cae97c`	`991fd3baf4`	Used fast-forward merge of !110568
#109151	`830730e2cc`	`6f7e819b29`	Used fast-forward merge of !110568
#109151	`a1d7ec7139`	`15f6e83319`	Used fast-forward merge of !110568
#109151	`05243a4206`	`1b1a9b80ae`	Used fast-forward merge of !110568
#109151	`aecf6dd1db`	`6839c1c2ec`	Used fast-forward merge of !110568
	`a14c747fe8`	`fbcaf7bf6f`	conflicts, resolved
#110627	`8d4c847052`	`d121ed4755`
#110041	`c774cc0cc0`	`acd207794e`
#110609	`55413e0fc6`	`7180271d56`
#110333	`61ee554e3f`	`84734cfe94`	conflicts, resolved
#110205	`76817e5951`	`d5bd58db88`
#109781	`04a07d5e08`	`ec016f7c1b`
	`5dfd3e3c28`	`c426d5b084`
	`e1b1b2a8b4`	`455683c838`	conflicts, resolved
	blender/blender-addons@42cf86d957	blender/blender-addons@c94cc788
	blender/blender-addons@31e3364946	blender/blender-addons@18d26d61
	blender/blender-addons@4937b5d473	blender/blender-addons@82ce03ac
	blender/blender-addons@718e83e08f	blender/blender-addons@90a7110b	conflicts, resolved
blender/blender-addons#104781	blender/blender-addons@398ebfd091	blender/blender-addons@2a562f9a
	blender/blender-addons@08ec3386cd	blender/blender-addons@973e85bd
#110471	`09b6eac5c4`	`c040c59e3f`	had conflicts, used !110996
#109460	`cd74ba6413`	`39d7f793f9`	cherrypicked and built fine on linux, but windows buildbot complained... used !111001
#110601	blender/blender-addons@ee1f3fe43f	blender/blender-addons@3ba54b66	was apparently added to the wrong list (bottom of 3.6.1)
#109781	`babc650779`	`2f2aecb507`	was apparently added to the wrong list (bottom of 3.6.1)
#109799	`2e246e355e`	`e8d1afb909`	was apparently added to the wrong list (bottom of 3.6.1)
#110372	`ee96947abc`	`b20953c2c9`	was apparently added to the wrong list (bottom of 3.6.1)

Blender 3.6.1

Report	Commits in `main`	Commits in LTS	Remarks
#108171	`c47074f3bb`	`eeec5e6822`
#109004	`daf414b48e`, `6221410409`	`ce7cde954e`, `596d4ff55f`
#109218	`f8981b6492`	`7fe112c56d`
	`a60c1e5bb8`	`6adfd2ae39`
	`09c0c86d83`	`45bf61f131`
	`0f3b691c22`	`f825a346fc`
#109198	`258ba398ed`	`18ae7eb689`
#109302	`128c95438f`	`d990e01342`
#109519	`e73a9a6a7d`	`122d380a7c`
#109438	`56e9abf133`	`5590993f95`
#109523	`f6f3a6a928`	`cbcbba23d5`
#109577	`dd4f0cebae`	`c1b2e25c2d`
#109455	`5308abafd8`	`866d43ae9d`
#109590	`ad4aa692ce`	`8073325ddc`
	`0aafc49c91`	`9f6a4d0c06`
	`fb8c9a2a42`	`7880ae7c78`
#109550	`03fd794130`	`472e9c37b5`
#109442	`5c37e2123e`	`2cbf2885dd`
#109570		`1f779f1df2`	used PR #109727
#109745		`0f510f3ae9`
#109691		`7538127a58`
	`9889d0ef6f`	8bbd05e76f
	`d2c87c3281`	34965bfcca
	`df0d6d0022`	737c941eca
	`6dd51353dd`	1b76b95886
blender/blender-addons#104573	blender/blender-addons@cbf4156ebc	blender/blender-addons@afa9b939
blender/blender-addons#104737	blender/blender-addons@65ef64dd01	blender/blender-addons@dab724af
	blender/blender-addons@4c16d0a066, blender/blender-addons@c676d54cb9	blender/blender-addons@8e348cb5, blender/blender-addons@a518e601
#109562	`2ee0c23a82`	`5283ef4ce5`
	`3195a4cef1`	`fa2a28e96d`
	`1b84135fb5`	`59ab70b594`
	`7c4108567b`	`ab457ae62e`
	`e73bb628ee`	`a81dccceaf`
#109471	`87b8e2e18d`	`99d7e9fb55`
#103918	`7e55dfcf27`	`155e1830bd`
#109532	`751db88748`	`9383f4d067`
	`7271ceb057`	`8142195f29`
	`7e24a0a2ec`	`aef44c2d50`
#109887	`9314f97afd`	`b831ef579b`
	`18efd11369`	`be09111784`
#109952	`8a73c36643`	`906128e9e7`
#106905	`ac708cb33a`	`d9ae68b9e3`
#109389	`232d763af4`	`937c72cf89`
#109898	`53e1bae929`	`1795598c59`
#109885	`a8186e1542`	`696b1804dd`	conflicts, resolved
#109662	`d3315422ae`	`41782dfd52`	conflicts, resolved
#109040	`70b05249cb`	`fba02d14a7`
#109928	`9c9664c823`, `791a06061c`	`9ba5d63ed7`, `60b25936fe`
#109822	`ac3f4e959f`	`86420289e3`	conflicts, resolved
#109802	`300cfecc46`	`a7221d2993`
	`784d09a87c`, `1c0ffa1e18`	`3d2bae8a5d`
#109718	`b29d2c607d`	`bab9133412`
#109433	`fc0e110e60`	`75e0aab868`
#109565	`74772c6920`	`05f4458f39`
#109633	`6abf253689`	`fc44305e72`
#109418	`cc1ee96407`	`a8b82bd89e`
#110005	`111e378366`	`edc1a09966`
#110161	`5b3398a673`

@mano-wii : could you create PRs targeting the blender-v3.6-release branch for the commits in your repo? Think this would be the easiest to get them merged...

@mano-wii : could you create PRs targeting the `blender-v3.6-release` branch for the commits in your repo? Think this would be the easiest to get them merged...

@lichtwerk, these are the PR for each:
#109445
#109656

@lichtwerk, these are the PR for each: #109445 #109656

@HooglyBoogly , @mano-wii : could you check on the remaining conflicts ? @mano-wii : think you could also just land your PR yourself.
If in doubt, please consult @ThomasDinges , I'll be back tomorrow

@HooglyBoogly , @mano-wii : could you check on the remaining conflicts ? @mano-wii : think you could also just land your PR yourself. If in doubt, please consult @ThomasDinges , I'll be back tomorrow

@mano-wii : think you could also just land your PR yourself.

I did and it seems to work fine :) (!109445)

> @mano-wii : think you could also just land your PR yourself. I did and it seems to work fine :) (!109445)

I did and it seems to work fine :) (!109445)

Could you please add it to the list of actual commits in Blender 3.6.1 then?

> I did and it seems to work fine :) (!109445) Could you please add it to the list of actual commits in Blender 3.6.1 then?

Done

Hello,
I want to add this commit to the list, but because this task is on blender, and not blender-addons, I don't have any rights to edit the task.
Can someone add it to the list? Thanks

blender/blender-addons@31e3364946

Hello, I want to add this commit to the list, but because this task is on blender, and not blender-addons, I don't have any rights to edit the task. Can someone add it to the list? Thanks blender/blender-addons@31e3364946

Hello,
Would it be possible to add this issue to the backport list?
#109583

I hope it is ok to ask this here.
It is keeping me from switching to Blender 3.6

Hello, Would it be possible to add this issue to the backport list? https://projects.blender.org/blender/blender/issues/109583 I hope it is ok to ask this here. It is keeping me from switching to Blender 3.6

Would it be possible to add this issue to the backport list? #109583

@HooglyBoogly ^

> Would it be possible to add this issue to the backport list? #109583 @HooglyBoogly ^

Yes, that seems reasonable, thanks for bringing it up.

@HooglyBoogly , @JacquesLucke , @mano-wii : could you check on the "backportability" of 580833165c , b6df32f740 , c02f2f4947 (had conflicts I wasnt 100% sure how to resolve)

@HooglyBoogly , @JacquesLucke , @mano-wii : could you check on the "backportability" of 580833165c , b6df32f740 , c02f2f4947 (had conflicts I wasnt 100% sure how to resolve)

b6df32f740 can certainly be backported, I'll create a patch for it.

b6df32f740 can certainly be backported, I'll create a patch for it.

I resolved the conflicts and committed directly to blender-v3.6-release (hope it's ok).

I edited the comment in the tables but didn't move it to the other table.

main	blender-v3.6-release
`c02f2f4947`	`ed8d18a3fc`
`a0b232c80d`	`d371c3c09f`

I resolved the conflicts and committed directly to `blender-v3.6-release` (hope it's ok). I edited the comment in the tables but didn't move it to the other table. | main | blender-v3.6-release | | --- | --- | | c02f2f4947 | ed8d18a3fc | | a0b232c80d | d371c3c09f |

Added a backport PR for b6df32f740: #112015.

@mano-wii : moved those commits to the Blender 3.6.3 section now.

@mano-wii : moved those commits to the `Blender 3.6.3` section now.

If we need support the agx for 3.6.3 from 4.0?
Because 3.6 is LTS edition. It will use for long time

If we need support the agx for 3.6.3 from 4.0? Because 3.6 is LTS edition. It will use for long time

@HooglyBoogly : backporting f41dc90925 had conflicts that I would prefer you handling

@HooglyBoogly : backporting f41dc90925 had conflicts that I would prefer you handling

@brecht / @BrianSavery / @HooglyBoogly / @nrupsis / @filedescriptor : had some commits with conflicts where I would prefer if you could check, create a 3.6 specific PR, or commit directly to the branch (if you do, please update the corresponding list), thx in advance!

@lichtwerk for #112068 the issue is that the grease_pencil.cc file doesn't exist in 3.6. But the changes to that file can be safely ignored. The important changes are in the curves files.

@lichtwerk for #112068 the issue is that the `grease_pencil.cc` file doesn't exist in 3.6. But the changes to that file can be safely ignored. The important changes are in the curves files.

@lichtwerk I have a backport PR for #9da88301ef: PR: #112347.

@lichtwerk I have a backport PR for [#9da88301ef](https://projects.blender.org/blender/blender/commit/9da88301efea47d184f347f2b2e54742351361d7): [PR: #112347](https://projects.blender.org/blender/blender/pulls/112347).

@lichtwerk for #112068 the issue is that the grease_pencil.cc file doesn't exist in 3.6. But the changes to that file can be safely ignored. The important changes are in the curves files.

@filedescriptor : could you just make a PR for this?

> @lichtwerk for #112068 the issue is that the `grease_pencil.cc` file doesn't exist in 3.6. But the changes to that file can be safely ignored. The important changes are in the curves files. @filedescriptor : could you just make a PR for this?

@lichtwerk Sure :)
EDIT: Here you go! #112366

@lichtwerk Sure :) EDIT: Here you go! https://projects.blender.org/blender/blender/pulls/112366

blender/blender-addons@1467d62c79 is a math fix in Rigify that I think is safe and could be backported.

blender/blender-addons@1467d62c793372c4f90e8739e64445f93d3a78a6 is a math fix in Rigify that I think is safe and could be backported.

@angavrilov you can just add it to the list.

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Blender LTS: Maintenance Task 3.6 #109399

To Be Backported

Blender 3.6.4

Blender 3.6.3

Blender 3.6.2

Blender 3.6.1