Blender LTS: Maintenance Task 3.6 #109399

New Issue

Thomas Dinges · 2023-06-27T08:31:17+02:00

Thomas Dinges commented

2023-06-27 08:31:17 +02:00

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
	`e3a02b9b02`
#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`
#113386	`535d211c94`	conflicts, @JacquesLucke: do we want `34b4487844` in LTS as well? >> it was decided against `34b448784` in LTS
#114414	`2193bd4b89`	conflicts, also: do we want `ed540b4d3a` as well?
	blender/blender-addons@17dd7cde6, blender/blender-addons@b1786fb4a, blender/blender-addons@51bad26f2, blender/blender-addons@690678a9a, blender/blender-addons@0bc87fda6, blender/blender-addons@02bd2a2ad, blender/blender-addons@9f6d4b718, blender/blender-addons@cd5ba93be, blender/blender-addons@cbaf3ef7a, blender/blender-addons@2701cca9b, blender/blender-addons@5f2dbfc43, blender/blender-addons@49b57318e, blender/blender-addons@6c9e2d7d4, blender/blender-addons@f8cac4acf, blender/blender-addons@3804000c2, blender/blender-addons@d50d3f273, blender/blender-addons@93f85a392	Pull request for Node Wrangler at blender/blender-addons!105169
#106999	`2f1b9432be`	conflicts (IndexMask::from_predicate only introduced later), probably not going to get backported then
#117572	`83dbbf9aec`	conflicts (~~also followup issue #118550 that needs to be resolved prior~~)
#118637	`a6060ea8ee`	not relevant for 3.6 actually
#104002	`e623d07362`	having this without `b248295530` [which gives non-trivial conflicts] would cause harm, so reverted `93f8b59172` , likely not going to get backported at all then
#110161	`5b3398a673`	? was already backported in Blender 3.6.3 ?
#117572	`83dbbf9aec`	conflicts (~~also followup issue #118550 that needs to be resolved prior~~), prefer if @JulianEisel backports
#56355	`1f44be97e6`	conflicts (because of tests/data)
	`d4d5281d45`	conflicts, depends on the above ^^
	`d66b42e382`	conflicts, prefer if @HooglyBoogly checks
#121666	`710d168e30`	conflicts, missing `CustomData_ensure_data_is_mutable`, probably not going to get backported
#123220	`751745b2de`	changes behavior a bit, not sure if this should be backported..
#123770	`d4f5d4a6f6`	conflicts, not worth the hassle since `6de6d7267f` is not in 3.6
#123560	`296d05060d`	conflicts, missing BKE_object_material_index_get
	`c13c502624`	conflicts, not worth the hassle unless explicitly requested

Blender 3.6.16

Report	Commits in `main`	Commits in LTS	Remarks
#126799	blender/blender@77035192c9	blender/blender@9eabc20a48
	blender/blender@92d935a205	blender/blender@1da590cd2e	Fixes a build issue for the latest VS 2022
#127453	blender/blender@36c11ee482	blender/blender@c8e4139d4a
#127142	blender/blender@3915a84fc6	blender/blender@4842c3686a	Used !127150 instead

Blender 3.6.15

Report	Commits in `main`	Commits in LTS
#125168	`90e83175eb`	`99618031b3`
#125064	`163baad17e`	`c788de853e`
#116229	`3f33b06dde`	`3c208a171c`

Blender 3.6.14

Report	Commits in `main`	Commits in LTS	Remarks
#118148	`696848204c`	`472243310b`
#123473	`633dbe0292`	`8c68ded7b9`
	`4477641467`	`2ae87b8fb0`
#94125	`bc0b86797c`	`063ac47021`	conflicts, resolved
#123448	`95d11b0d33`	`5da75183d9`	updated test file

Blender 3.6.13

Report	Commits in `main`	Commits in LTS	Remarks
#119945	`669b15a53d`	`b11ffad1df`
#121864	`58f5b128c9`	`246c57cbe2`
#122150	`6256e2a838`	`59f21ebce0`
#122344	`40e036b63e`	`7c9d59414a`
#122429	`7a11fad380`	`60986373bc`	conflicts, resolved
#122598	`ba3fac92af`	`6846976ffc`
#122526	`9b1d81eec2`	`9d2a1c14c4`
#82483	`6cccbc8df9`	`31a98dc847`
#119999	`2736446d65`, `c6f0d8daa6`	`267df240b2`, `6807f35a8f`	backport issue was #122059

Blender 3.6.12

Report	Commits in `main`	Commits in LTS	Remarks
#120788	N/A	`0f721f705d`	Reverts `71b159d158` from 3.6.7
#120721	`0bda626ba3`	`8e0032781b`	conflicts, resolved
#120748	`f72dbc1ef8`	`7573ee73dd`
	`edfba89d1e`	`c02b4b27da`
#120084	`7400927ada`	`263ce1ebb0`
#121310	`24560b6016`	`2d51478723`
#121108	`aa65bdbebc`	`d30df88748`
#121121	`b57916463c`	`02b0cbbf2e`	conflicts, resolved

Blender 3.6.11

Report	Commits in `main`	Commits in LTS	Remarks
#108078	`303014bfac`	`b42f22caf5`
#118137	`1e478cf169`	`9026131c80`	conflicts, resolved
#119275	`2d49cc597f`	`6babdb7169`
#109363	`c584597165`	`2ff46a6974`	conflicts, resolved
#116262	`2886859347`	`58c4eb8009`
#119523	`5ba581bd0a`	`4423582c2f`
#119992	`a5c5cf473e`	`f4e74b0e1a`	conflicts, resolved
#120007	`598819049e`	`c118e8716b`

Blender 3.6.10

Report	Commits in `main`	Commits in LTS	Remarks
#108978	`a99d9ba635`, `63613e431e`, `9277377f6b`	`a99d9ba635`, `7180164abb`, `2b46a1517e`, `2362c73560`	Switch SVN to Git submodules using Git-LFS (!118628)
N/A	`ea10be4dd6`	`888c41316f`, `9a403ab34f`	Update `install_linux_packages.py` to include Git LFS
#117586	`b10507ab63`	`8508d6992b`
#118225	`1a2edde400`	`f9ec766165`
#118378	`745d2e18dc`	`1dc6de7d77`
#105968	`8675fc50dc`	`c1d6d8d361`
#118351	`a677518cb5`	`a252833562`
#102930	`d2f8af9b08`	`a812cbb241`
	`56bfd56735`	`a370276060`	conflicts, resolved
	`0a173b942b`	`5fc714999b`
	`659f05ef28`	`89d8f12730`
#112983	`3e09fbf062`	`b93d1c481e`
	`e65de74aa5`	`0ea4ac2ef3`
#119058	`ee98482b44`	`5aa52624b3`
#104657	`ae022e515b`	`fc2aab661e`
#102860	`f880cbce93`	`0924a8208b`
#95411	`959595069d`	`c577ffab3e`
#84848	`8c3b85d666`	`ac3e0d024d`
#119142	`021565d867`	`0c1ce783c3`	conflicts, resolved
#119106	`2191cbf7f5`	`e7332f5309`
#54468	`a8b9a58608`	`73f313c119`	conflicts, resolved
#114552	`5d1d447c2b`	`aa7d7b0fbf`
#79961	`d5fe4c40ed`	`b347c7e9fe`	conflicts, resolved
	blender/lib-linux_x64@e8bd2af257	blender/lib-linux_x64@95c42a9d
	`98343c0c17`	`d8cca36c78`	conflicts, resolved
#117485	`1e44d811ac`	`7999e39f35`	conflicts, resolved
#101227	`a060e96103`	`0fa7356810`	conflicts, resolved
	`af953514e7`	`23df139aaf`
	`281e45ec30`	`b54a26ede4`
#118299	`88ba4dfaa3`	`94554354a3`	done by @mont29
#118300	`da101d8cdb`	`cdb6e15b62`	done by @mont29
	`6adf5adb7f`	`2c4589ca82`	done by @mont29, some non-trivial differences from `main` commit

Blender 3.6.9

Report	Commits in `main`	Commits in LTS	Remarks
#117647	N/A	`d885933be3`	Was indirectly fixed in future version, require separate small fix commit for older versions: #117648
#107353	`9ad6957574`	`1bebc27c70`	had conflicts, used !115232
#117150	blender/blender-addons@d3105f1112	blender/blender-addons@34940819
#117397	blender/blender-addons@1a55379677	blender/blender-addons@8f4dc6d9
#97431	`d0359d066d`	`2b98ca4e54`
#117015	`e904432a1f`	`4be2fe27ad`	conflicts, resolved
#106425	`4da32e9334`	`51394779cf`
#68436	`c16b0216fe`	`9bb002aa4e`	build errors, resolved
#117526	`a324a19f1b`	`195b772859`	conflicts, resolved
#117530	`37e89714ff`	`86f581dc74`
#117411	`0c0885d323`	`4537ad051f`
#117674	`5e2bad1589`	`330f3e3c2b`	conflicts, resolved
#117674	`5e2bad1589`	`330f3e3c2b`	conflicts, resolved
	`1f142b3d44`	`02b9ea7072`
#54554	`f23da882e6`	`7356fb105c`	conflicts, resolved
#113803	`990c0ad42c`	`52248c54a3`
	`0053de6556`	`bc4b4e8ec3`
#108407	`d38824bc02`	`1fddbb798e`
#118055	`711e4cdd94`	`b69d06f648`
#117771	`a3183fb95f`	`583af2a6e5`
#108407	`401a2397db`	`bdc6a5419a`	Fixes mistake in `d38824bc02`
	`1161455084`, `ef80392721`, `7df6d9eb52`, `9d5164d472`, `5aed85dcd7`, `3faa5db2e9`	`b2d628cf27`	PR doing the backport: #117027 - needed ocloc library to be rebuilt on Linux

Blender 3.6.8

Report	Commits in `main`	Commits in LTS	Remarks
	`d2e91fb0d7`	`888612cb0e`
	`92c9a2d1bc`	`a4dd4fe220`	conflicts, used !115015
#115678	`1149bb216d`	`1e1a2f5b6d`
	`4c527b095a`	`27ce1cac80`
#115330	`beacdc3f01`	`b9ccfec2c6`	conflicts (C/C++ file refactor), resolved
#92621	`e503536775`	`4fe6cae6a6`
#116215	`7346727cfc`	`f4b335828d`	conflicts, resolved
#116193	`c23b51d614`	`cb81a52603`
#116274	`b70d387f2a`	`f3a309130a`	conflicts, resolved
#116280	`0681180413`	`d229d2bc90`
#116703	`f0fcd553df`	`f1b5807339`
#112599	`81017772f5`	`2f10d8bc80`	conflicts (because of `21c8af467d`), resolved in good faith
	`268f93d763`	`b2c34fa95b`	conflicts, resolved
#114282	`4bec9d0d71`	`dea7887c7b`
#115590	`f83180370a`	`ebbcc09149`
blender/blender-addons#105045	blender/blender-addons@f21b90cbab	blender/blender-addons@bd37c9b0fd	Used blender/blender-addons!105052
#114582	`7981b35064`	`746b2a89c9`
#115590		`b0d751e830`	used !116155 (`f83180370a` is already backported)
#116792	`b0d919181d`	`bcfb2e4a83`
#115978	`ba5a39a7c9`	`d499710218`

Blender 3.6.7

Report	Commits in `main`	Commits in LTS	Remarks
	`ea1de499b3`	`064a48ad28`
	`391b5ac93c`	`c3f67cd541`
	`1058fd1b2b`	`ec6aa0b3fd`	Fixes a build issue for VS 2022, not essential, but people have complained about it
#114685	`270fc860cf`	`77947af0d6`
	`21a54d5b58`	`71b159d158`
#113325	`697114c4b6`	`836063cbd6`
#113697	`49e4923384`	`94bd19bf1b`	conflicts, resolved
#115060	`4dede4efa8`	`29cd4eb559`	conflicts, resolved
#115363	`09be0915c3`	`cd7bc85237`
#114557	`ed556113ce`	`9089935f43`
	`609ac5e378`	`431a0844fc`	PR that pack-ports this fix: !114654
	`d2e91fb0d7`	`888612cb0e`

Blender 3.6.6

Report	Commits in `main`	Commits in LTS	Remarks
#110183	`97dfbc9`	`5f56992`
#112931	`97d9bbb` `a455eca`	`0548b2d` `9827c1f`
#113285	`1242512ff2`	`eec6991026`	conflicts, resolved
#113255	`f8d38b65a4`	`327fa72f8a`	conflicts, resolved
#113323	`40ea1cdb97`	`fab1e75228`
#112935	`534e7f4470`	`7f5cec2398`
#113461	`09046e8121`	`a1e7f2c0de`
#110524	`fa987dc059`	`c502becd40`
#113310	`4cedbb9cb7`	`7c8843c279`
#113429	`4d91c50b62`	`58e7575fb3`
#110415	`e6a0b4404c`	`efde40cb21`
#107920	`3cb659faa8`	`4d080c1daf`
#113798	`eed4f950d8`	`222f382e4a`
#107918	`6f0477bd1d`	`39f5b84b38`	build errors, resolved
#112683	`19b112b11c`	`50c784ecbf`	build errors, resolved
#111442	`10eb1ac8e4`	`87c93e7e37`
#114015	`2d7ccae528`	`d09f7887d1`
#114134	`46c180015a`	`d17f1194bb`
	`b7b74385cd`	`fa00609436`
	`8337b3dd3f`	`98ec3826ac`	part of PR !114353.
	`4e4fc8c276`	`6e51a2eaea`	part of PR !114353.
	`3e9403bd76`	`4eca55cc11`	part of PR !114353.
	`3ad21b2169`	`4b34443c10`	(requires `46159c131d`) part of PR !114353.
	`51467b0611`	`601141e01c`	(conflicts resolved) part of PR !114353.
	`ee15925716`	`06e08069fc`	(conflicts resolved) part of PR !114353.
#114536		`e0492754fe`	3.6 release branch only fix
#110666	`26346464e0`	`eff49a865f`	conflicts, used PR !114765, also !114793
	`39f7411065`	`00fbe3b112`	conflicts, resolved
#114152	`67445c2353`	`e939812968`
#114336	`49c3dc9`	`ade490ddd0`
#114304	`afe297231d`	`228da669a9`
#114415	`cc6c5cb7f4`	`e95b6e01c1`	conflicts, resolved
#114430	`9c2164ba7c`	`9ce76198b6`
#113810	`bb8cb4e56f`	`4a414cbe66`
#114216	`e7ad3af301`	`ea2c722688`	conflicts, resolved
#114358	`0a3b44ed64`	`cf61d16b15`
#114434	`0ca1e70de1`	`dfba707604`
	`c7afbbc836`	`09baf6a8bc`
#114363	`0eb279de54`	`6849168885`
#109430	`5974a4482a`	`a5fc69c9fc`
	`5cf3654d9d`	`e76cb15a3f`	conflicts, resolved

Blender 3.6.5

Report	Commits in `main`	Commits in LTS	Remarks
#109907	`ed36398`	`f41ea86`
#112623	`eadc54bb5d`	`6d466e4b94`, `5207c7e117`	not sure if this fixed #112623?
#110724	`89b3249c`	`2af8d24`
#109906	`d4cc0d02cb`	`086c431`
#111186	`8d26dda`	`49ef671`
	`c5e10920f9`	`8a15a61e0f`
!111055	`baeeff9a84`	`e6b99c15db`
	`a238ab737b`	`c80b45f646`
	blender/blender-addons@1467d62c79	blender/blender-addons@bf936d59
	blender/blender-addons@9ccd934d19	blender/blender-addons@8a4a56ea	conflicts, resolved
	`5ae99270c1`	`e785101e73`	build errors [C++ function style cast], resolved
#100596	`954ae19b2b` and `f6082a5042`	`96458a81ec` and `5518a9f43a`
#97628	`057de815ef`	`6f2ee29674`
#105196	`d102536b1a`	`9532b6a53d`
	`c29a78d80d`	`30eb74ca48`	conflicts, resolved
#109599	`7449f0e14c`	`f43866c729`
#112011	`bf23d0e53c`	`c0837bf545`	conflicts, resolved
#113002	`2d864846e4`	`fe013fbc5b`	conflicts, resolved
#113044	`e196f0a874`	`7135f75541`	conflicts [C++ conversion, also `ebb5643e59`], resolved
	`be7e2d01a8`	`7482137167`	conflicts [`b3c7f3c8a9`], resolved
#112548	`2d2c7457cf`	`6e65911dff`
#106760	`b0706a57ac`	`e34b424a61`	conflicts [`fde8e6ce` not in 3.6], resolved
	`5f7f6b65f3`	`b2c0e49bf3`
#113387	`4a57a56f87`	`03ce9278f9`
	`b9124d8a85`	`8b5d0ba19f`	used !112470 (PR as it conflicts).
	`66028c8c97`	`1f09031dc7`	used !112492 (PR is a simplified fix to avoid depending new functions).
#112909	`48204b630c`	`521a68323c`	used !112967 (PR as it conflicts).
#112922	`48204b630c`	`521a68323c`	used !112967 (PR as it conflicts).

Blender 3.6.4

Report	Commits in `main`	Commits in LTS	Remarks
#112673	`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`

Thomas Dinges added this to the 3.6 LTS milestone 2023-06-27 08:31:17 +02:00

Thomas Dinges added the

Type

To Do

label 2023-06-27 08:31:17 +02:00

Philipp Oeser was assigned by Thomas Dinges

2023-06-27 08:31:18 +02:00

Philipp Oeser referenced this issue

2023-06-27 08:57:21 +02:00

Operator bpy.ops.uv.pack_islands call leads to Blender crash #108171

Philipp Oeser referenced this issue

2023-06-27 08:58:00 +02:00

Fix #108171: bpy.ops.uv.pack_islands crash #109377

Philipp Oeser referenced this issue

2023-06-28 09:39:43 +02:00

Frame change handler no longer entered when playback stops #109218

Germano Cavalcante referenced this issue

2023-06-28 15:38:21 +02:00

Snapping no longer works behind faces/objects in wireframe/x-ray mode. #109433

Germano Cavalcante referenced this issue

2023-06-28 22:10:52 +02:00

Regression: Snapping to vertex buried in geometry no longer works. #109458

Jeroen Bakker referenced this issue

2023-06-29 16:09:51 +02:00

Fix #109389: Add small depth bias for paint face overlay #109505

Germano Cavalcante referenced this issue

2023-06-30 02:07:08 +02:00

Orbit Around Selection in Edit Mode is not working after 3.6.0 update #109519

Michael Parkin-White referenced this issue

2023-06-30 11:50:11 +02:00

Fix #109389: Add small depth bias for paint face overlay #109505

Germano Cavalcante referenced this issue

2023-06-30 17:51:05 +02:00

Edit mode. Snapping to self broken, when we look through another object even with x-ray #109560

Germano Cavalcante referenced this issue

2023-07-03 00:27:11 +02:00

Regression: Wireframe overlay on mesh Merge by Distance omits some edges #109577

Sergey Sharybin referenced this issue

2023-07-03 13:57:18 +02:00

Regression: Cycles: Optix not able to render without cuda toolkit #109550

Germano Cavalcante referenced this issue

2023-07-03 17:47:30 +02:00

vertex slide is broken when using shortcut double GG with face projection snap #109633

Philipp Oeser commented

2023-07-04 13:58:07 +02:00

@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...

Germano Cavalcante commented

2023-07-04 14:16:59 +02:00

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

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

👍 1

Philipp Oeser referenced this issue

2023-07-04 14:33:34 +02:00

Error when collection visibility property is used in driver expression (fixed in main, backport request) #109570

Sybren A. Stüvel referenced this issue

2023-07-10 15:41:47 +02:00

Fix #109781: Linked datablocks are keyable #109813

Pratik Borhade referenced this issue

2023-07-12 05:08:45 +02:00

Window autofocus misbehaves #109886

Philipp Oeser commented

2023-07-12 15:52:20 +02:00

@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

Chris Clyne (Lateasusual) referenced this issue

2023-07-12 16:49:46 +02:00

Face selection bug in Blender 3.6.0 LTS #110012

Germano Cavalcante commented

2023-07-12 21:15:16 +02:00

@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)

Iliya Katushenock referenced this issue

2023-07-12 21:23:08 +02:00

UILayout.template_node_view() doesn't render UI properly #99569

Harley Acheson referenced this issue

2023-07-13 01:46:10 +02:00

Window autofocus misbehaves #109886

Bastien Montagne referenced this issue

2023-07-13 10:17:50 +02:00

Errors encountered when re-opening a .blend file with multiple library overrides with local parents #109993

Philipp Oeser commented

2023-07-13 10:29:45 +02:00

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?

Germano Cavalcante commented

2023-07-13 14:32:48 +02:00

Done

Julien Duroure commented

2023-07-15 07:46:26 +02:00

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

👍 1

Jeroen Bakker referenced this issue

2023-07-16 09:29:30 +02:00

Graphics Tablet Lag when in Texture Paint mode in Blender 3.0 #93796

Philipp Oeser referenced this issue

2023-07-17 10:06:00 +02:00

Crash when switching to the Face select mode in 3.6 #110136

Ray molenkamp referenced this issue

2023-07-19 16:41:58 +02:00

Fix #109771: deps_builder: crash in Embree HW BVH building #109966

Pratik Borhade referenced this issue

2023-07-21 04:56:21 +02:00

Regression: Dragging an Nla strip causes a crash #109787

Philipp Oeser referenced this issue

2023-07-21 14:41:13 +02:00

Fix #110341: Appended text looses user after reload #110344

Pratik Borhade referenced this issue

2023-07-25 05:32:10 +02:00

Regression: Speaker ignoring of the starting position in NLA track #110336

YimingWu referenced this issue

2023-08-04 04:54:37 +02:00

Regression: Loading a VSE .blend file created in older version into 3.6.0 loses information about video/audio clip cut lengths #110333

Pratik Borhade referenced this issue

2023-08-07 07:47:14 +02:00

Fix #110255: Cover up CPU/GPU differences with small suns in light tree #110307

Falk David referenced this issue

2023-08-10 13:44:34 +02:00

Sim Nodes: Don't delete parent bake directory #110999

~~Germano Cavalcante referenced this issue from blender/blender-addons 2023-08-11 02:25:24 +02:00~~

Sapling Tree Gen #104831

Jeroen Bakker referenced this issue

2023-08-13 15:50:46 +02:00

GPU: Fix signed/unsigned mismatches in shader code #110490

Pratik Borhade referenced this issue

2023-08-14 07:29:37 +02:00

Freestyle render make crash without create folder. #111028

Pratik Borhade referenced this issue

2023-08-16 06:59:55 +02:00

Fix #109081: Ensure swap strips do not overlap each other. #109980

Philipp Oeser referenced this issue

2023-08-17 08:53:04 +02:00

Regression: Blender Crashes On Scene Switch #111165

Pratik Borhade referenced this issue

2023-08-19 11:45:28 +02:00

Freestyle render make crash without create folder. Part 2 #111286

Philipp Oeser referenced this issue

2023-08-21 09:37:35 +02:00

Crash on setting preview image for asset when File Browser is set to 'Maximized Area' #111297

Philipp Oeser referenced this issue

2023-08-21 09:37:49 +02:00

Crash when changing asset icon #106976

Harley Acheson referenced this issue

2023-08-23 22:11:53 +02:00

Blender crash when using auto-complete on TextCurve in the python console #111444

Jens commented

2023-08-24 19:36:39 +02:00

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

Pratik Borhade commented

2023-08-25 05:12:19 +02:00

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 ^

Hans Goudey commented

2023-08-25 14:00:06 +02:00

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

Philipp Oeser referenced this issue

2023-08-31 11:16:45 +02:00

NLA crash moving sound strip (fixed in main, needs backport) #111724

Philipp Oeser referenced this issue

2023-08-31 11:20:38 +02:00

Regression: Crash on dragging a Speaker NLA strip #110161

Philipp Oeser referenced this issue

2023-08-31 11:22:38 +02:00

NLA crash moving sound strip (fixed in main, needs backport) #111724

Pratik Borhade referenced this issue

2023-09-01 05:11:27 +02:00

Regression: Adding nodes into node network causes strange placement and jump of node #111593

Philipp Oeser referenced this issue

2023-09-04 15:07:57 +02:00

Asset Library assets added through Node Add menu ignore Import Method #111777

Philipp Oeser referenced this issue

2023-09-05 13:02:21 +02:00

Fix #111933: wrong rest position #111958

Philipp Oeser commented

2023-09-05 15:55:06 +02:00

@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)

👍 1

Jacques Lucke commented

2023-09-05 16:35:18 +02:00

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

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

Germano Cavalcante commented

2023-09-05 17:19:42 +02:00

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 |

👍 1

Jacques Lucke commented

2023-09-06 11:15:35 +02:00

Added a backport PR for b6df32f740: #112015.

Added a backport PR for b6df32f740: #112015.

👍 1

Philipp Oeser commented

2023-09-06 12:57:49 +02:00

@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.

aperitero referenced this issue

2023-09-08 15:18:48 +02:00

Overlay drawing issues on Intel HD4400/4600 (Only?) #111162

Feng commented

2023-09-11 03:50:52 +02:00

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

Sybren A. Stüvel referenced this issue

2023-09-11 10:57:01 +02:00

Fix #110161: Crash on dragging a Speaker NLA strip #110605

Philipp Oeser referenced this issue

2023-09-11 12:53:46 +02:00

Fix #111978: Passthrough if there is no simulation state (backport to 3.6) #112110

Philipp Oeser commented

2023-09-13 11:44:27 +02:00

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

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

👍 1

Philipp Oeser commented

2023-09-13 16:36:00 +02:00

@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!

👀 2

Falk David commented

2023-09-13 16:51:32 +02:00

@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.

Nate Rupsis commented

2023-09-13 21:14:46 +02:00

@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).

Philipp Oeser commented

2023-09-14 11:15:16 +02:00

@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?

Falk David commented

2023-09-14 11:29:59 +02:00

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

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

Jacques Lucke referenced this issue

2023-09-14 21:42:06 +02:00

Blender deleted my entire projects folder #112381

Philipp Oeser referenced this issue

2023-09-15 12:43:14 +02:00

Regression: Menu Search crash if mouse is outside of the blender window #111212

Alexander Gavrilov commented

2023-09-21 11:20:47 +02:00

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.

Brecht Van Lommel commented

2023-09-21 19:42:59 +02:00

@angavrilov you can just add it to the list.

Harley Acheson referenced this issue

2023-09-21 20:32:39 +02:00

Outliner Floating window Drag & Drop to Geometry Nodes editor not working #112613

Pratik Borhade referenced this issue

2023-09-22 11:12:33 +02:00

Outliner Floating window Drag & Drop to Geometry Nodes editor not working #112613

Philipp Oeser referenced this issue

2023-09-25 11:13:01 +02:00

"Jump to keyframe" grayed out. Unable to jump between keyframes. #112673

Julien Duroure commented

2023-09-25 12:49:15 +02:00

Can we please add 9ccd934d19 to the list? I don't have any rights on blender core repo, only on blender-addons one, so I can't edit the list

Can we please add https://projects.blender.org/blender/blender-addons/commit/9ccd934d19f7764f4958c8651d3225392cd36e23 to the list? I don't have any rights on blender core repo, only on blender-addons one, so I can't edit the list

Brecht Van Lommel commented

2023-09-25 13:09:39 +02:00

@JulienDuroure done, and I also gave you the permissions to edit this issue in the future.

👍 1

Germano Cavalcante referenced this issue

2023-09-27 21:46:55 +02:00

Bevel + Weld modifer Crash #112922

Daniel Gryningstjerna referenced this issue

2023-09-27 21:54:15 +02:00

Bevel + Weld modifer Crash #112922

Philipp Oeser referenced this issue

2023-10-04 09:45:19 +02:00

Start getting Blender default Font in Text rendering after long use #113044

Philipp Oeser referenced this issue

2023-10-04 12:47:52 +02:00

rna_idprop_ui_create - error creating custom property with default integer value #113242

Pratik Borhade referenced this issue

2023-10-23 04:24:04 +02:00

[Weight Paint][Gradient] Does not take locking into account #114042

Philipp Oeser referenced this issue

2023-10-23 09:17:09 +02:00

Regression: Array Caps broken on empty mesh in 3.5. #107353

Pratik Borhade referenced this issue

2023-10-23 11:12:05 +02:00

context.annotation_data isn't set to nullptr when the last annotation layer is deleted #112683

Philipp Oeser referenced this issue

2023-11-02 13:25:38 +01:00

Hard crash when attempting to make objects in an overriden linked collection local. #114402

Pratik Borhade referenced this issue

2023-11-06 07:23:29 +01:00

VSE: Separate Images (Y) is broken - It is only duplicating the first image to all the resulting strips #114434

Pratik Borhade referenced this issue

2023-11-07 11:00:34 +01:00

Regression: Crash on deleting NLA strip in tweak mode #109430

Philipp Oeser commented

2023-11-07 15:42:09 +01:00

@mod_moder / @HooglyBoogly / @brecht / @JacquesLucke / @Alaska / @Hoshinova : ran into conflicts (or have remarks when) backporting your commits, mind checking on these (see remarks in To Be Backported)? Thx in advance!

@mod_moder / @HooglyBoogly / @brecht / @JacquesLucke / @Alaska / @Hoshinova : ran into conflicts (or have remarks when) backporting your commits, mind checking on these (see remarks in `To Be Backported`)? Thx in advance!

👍 1

Hoshinova commented

2023-11-07 16:33:27 +01:00

@lichtwerk 92c9a2d1bc was originally only meant for 4.0, not 3.6 LTS. But I'll also make the necessary changes for it to work in 3.6 LTS.

@lichtwerk https://projects.blender.org/blender/blender/commit/92c9a2d1bc06c1666624508e3429042ffce1c15d was originally only meant for 4.0, not 3.6 LTS. But I'll also make the necessary changes for it to work in 3.6 LTS.

Alaska commented

2023-11-08 00:40:51 +01:00

@lichtwerk 61a8d1f7d0 fails because if any of the Cycles tests were saved in a version of Blender prior to 3.5, and get their sampling pattern converted to Sobol Burley with versioning code. Then that commit will convert the sampling pattern to Tabulated Sobol instead. Since the sampling pattern is different between the test image and the new test file, the renders have different noise patterns and thus fail.

c8365bb217 fails for a similar reason. If the debug UI is off (which it probably is for tests), then any file that uses the Sobol Burley sampling pattern will use Tabulated Sobol instead. So you get the same issue, the sampling pattern is different between test image and file being rendered, resulting in a noise difference, resulting in a test failure.

Running the tests locally, the only issue I found was that the noise was different. There didn't appear to be any artifacts or crashes or things like that.

I should note, one more test fails with c8365bb217. This is because 61a8d1f7d0 handles files saved prior to 3.5. c8365bb217 handles all files. And the tests do include at least one test saved after 3.5 with Sobol Burley enabled. So it's handled by c8365bb217 but not 61a8d1f7d0.

To fix this, the test images just need to be updated. I don't have experience with this, or commit access (I'm just a community member), so I'm not sure how to help.

@lichtwerk 61a8d1f7d0 fails because if any of the Cycles tests were saved in a version of Blender prior to 3.5, and get their sampling pattern converted to Sobol Burley with versioning code. Then that commit will convert the sampling pattern to Tabulated Sobol instead. Since the sampling pattern is different between the test image and the new test file, the renders have different noise patterns and thus fail. c8365bb217 fails for a similar reason. If the debug UI is off (which it probably is for tests), then any file that uses the Sobol Burley sampling pattern will use Tabulated Sobol instead. So you get the same issue, the sampling pattern is different between test image and file being rendered, resulting in a noise difference, resulting in a test failure. Running the tests locally, the only issue I found was that the noise was different. There didn't appear to be any artifacts or crashes or things like that. I should note, one more test fails with c8365bb217. This is because 61a8d1f7d0 handles files saved prior to 3.5. c8365bb217 handles all files. And the tests do include at least one test saved after 3.5 with Sobol Burley enabled. So it's handled by c8365bb217 but not 61a8d1f7d0. To fix this, the test images just need to be updated. I don't have experience with this, or commit access (I'm just a community member), so I'm not sure how to help.

Hans Goudey referenced this issue

2023-11-09 00:27:58 +01:00

Cannot undo python opeartor that writes to curve attribute - if #114173

Julian Eisel commented

2023-11-11 23:21:37 +01:00

Committed e0492754fe (3.6 branch only commit) and added it to the 3.6.6 table.

Committed e0492754fe (3.6 branch only commit) and added it to the 3.6.6 table.

👍 1

Brecht Van Lommel commented

2023-11-13 14:56:45 +01:00

Removed #111117 / 3f633503d3 because as noted, the bug that introduced is not in 3.6.
Removed #109906 / d4cc0d02cb since it was already backported.
Removed c8365bb217 and 61a8d1f7d0, not critical enough to be worth the effort backporting this debug sampling pattern stuff.

* Removed #111117 / 3f633503d3 because as noted, the bug that introduced is not in 3.6. * Removed #109906 / d4cc0d02cb since it was already backported. * Removed c8365bb217 and 61a8d1f7d0, not critical enough to be worth the effort backporting this debug sampling pattern stuff.

👍 1

Philipp Oeser commented

2023-11-14 16:16:01 +01:00

@Jeroen-Bakker : backporting 2193bd4b89 has conflicts, also: do we want ed540b4d3a as well?

@Jeroen-Bakker : backporting 2193bd4b89 has conflicts, also: do we want ed540b4d3a as well?

Hoshinova commented

2023-11-16 21:08:20 +01:00

@lichtwerk @brecht This PR #115015 backports 92c9a2d1bc to 3.6 LTS correctly.

@lichtwerk @brecht This PR https://projects.blender.org/blender/blender/pulls/115015 backports 92c9a2d1bc to 3.6 LTS correctly.

Philipp Oeser referenced this issue

2023-12-15 10:35:28 +01:00

Regression: VSE: Crash unlinking packed font file from text strip with more than one user #116215

Philipp Oeser commented

2024-01-10 09:26:52 +01:00

@mano-wii : reg. !116155 : this now has conflicts, could you update again? (f83180370a is already backported)

@mano-wii : reg. !116155 : this now has conflicts, could you update again? (f83180370a is already backported)

Germano Cavalcante commented

2024-01-10 14:38:17 +01:00

@mano-wii : reg. !116155 : this now has conflicts, could you update again? (f83180370a is already backported)

Conflicts resolved

> @mano-wii : reg. !116155 : this now has conflicts, could you update again? (f83180370a is already backported) Conflicts resolved

👍 1

Pratik Borhade commented

2024-02-06 11:21:37 +01:00

conflicts, @JacquesLucke: do we want 34b4487844 in LTS as well?

34b4487844 fixes #114173 , good to have this commit as well in 3.6 :)

> conflicts, `@JacquesLucke:` do we want 34b4487844 in LTS as well? 34b4487844 fixes #114173 , good to have this commit as well in 3.6 :)

Philipp Oeser referenced this issue

2024-02-06 11:39:59 +01:00

Painting with bpy.ops.paint.image_paint() uses previous stencil color space #117800

Jacques Lucke commented

2024-02-06 11:52:05 +01:00

While 34b4487844 would be nice, it's less of a nobrainer, because some people were relying on the buggy behavior. See #113621. It's probably safer not to fix this particular thing in 3.6.

While 34b4487844 would be nice, it's less of a nobrainer, because some people were relying on the buggy behavior. See #113621. It's probably safer not to fix this particular thing in 3.6.

👍 1

Pratik Borhade referenced this issue

2024-02-06 12:11:43 +01:00

Cannot undo python opeartor that writes to curve attribute - if #114173

Philipp Oeser referenced this issue

2024-02-14 12:15:30 +01:00

Fix #109670: attribute shared between geometries even when edited (backport to 3.6) #115234

Philipp Oeser referenced this issue

2024-02-14 12:21:58 +01:00

Fix #117647: Accumulate Field ID input is not connecting via gather link searcher #117648

Harley Acheson referenced this issue

2024-02-19 17:56:10 +01:00

image > copy, adds 3 white pixels on the left, deletes 3 pixels on the right #118351

Philipp Oeser referenced this issue

2024-02-21 09:10:23 +01:00

Top vertical scrollbar tool not working properly 3.6.8 LTS #117572

Philipp Oeser referenced this issue

2024-02-27 16:20:26 +01:00

Geometry node - setting lacunarity to 0 crashes Blender (musgrave texture) [fine in 4.1, request to ackport] #100838

Charlie Jolly referenced this issue

2024-02-27 17:00:50 +01:00

Geometry node - setting lacunarity to 0 crashes Blender (musgrave texture) [fine in 4.1, request to ackport] #100838

Alaska commented

2024-03-04 08:54:39 +01:00

98343c0c17 plus the relevant library upgrade needs to be back ported to 3.6 on Linux. However I'm not sure how libraries are handled for LTS so I haven't added it to the task.

98343c0c17d0e7f81943729731e0de99cd0221e9 plus the relevant library upgrade needs to be back ported to 3.6 on Linux. However I'm not sure how libraries are handled for LTS so I haven't added it to the task.

👍 1

Brecht Van Lommel commented

2024-03-05 15:39:03 +01:00

I've added both the library and blender commit to the list now. Backporting libraries should be something like this:

git checkout blender-v3.6-release
make update
cd lib/linux_x64
git checkout blender-v3.6-release
git pull origin blender-v3.6-release
git cherry-pick <hash>
git push origin blender-v3.6-release
cd ../..
git commit lib/linux_x64
git push origin blender-v3.6-release

I can do it too if needed.

I've added both the library and blender commit to the list now. Backporting libraries should be something like this: ``` git checkout blender-v3.6-release make update cd lib/linux_x64 git checkout blender-v3.6-release git pull origin blender-v3.6-release git cherry-pick <hash> git push origin blender-v3.6-release cd ../.. git commit lib/linux_x64 git push origin blender-v3.6-release ``` I can do it too if needed.

Pratik Borhade referenced this issue

2024-03-08 04:03:44 +01:00

Deleting an unused light group caused the environment light group to render to another light group #117586

Philipp Oeser commented

2024-03-12 09:20:02 +01:00

@brecht : there was this discussion about storing .h files with Git LFS, that is also the case with
e8bd2af257 [which I wanted to backport]. What is the solution to that?

@brecht : there was this discussion about storing .h files with Git LFS, that is also the case with https://projects.blender.org/blender/lib-linux_x64/commit/e8bd2af257059e067997985214c85c27ebd79d86 [which I wanted to backport]. What is the solution to that?

Philipp Oeser commented

2024-03-12 10:48:53 +01:00

@brecht @mont29 had a few conflicting backport commits (see the To Be Backported section) where apparently stuff happened in between 3.6 and now. Sorry if these are obvious, but prefer if you have a second eye, thx in advance.

@brecht @mont29 had a few conflicting backport commits (see the **To Be Backported** section) where apparently stuff happened in between 3.6 and now. Sorry if these are obvious, but prefer if you have a second eye, thx in advance.

👍 1

Brecht Van Lommel commented

2024-03-12 11:43:20 +01:00

@lichtwerk I see no issue with the storage of .h files in that commit, it should be fine to backport. Only the binary files have "(Stored with Git LFS)" next to them.

Philipp Oeser referenced this issue

2024-03-12 16:29:36 +01:00

Blender LTS: Maintenance Task 3.3 #100749

Bastien Montagne referenced this issue

2024-03-13 17:08:31 +01:00

blender-v3.6-release #119429

Philipp Oeser referenced this issue

2024-03-19 09:51:08 +01:00

Fix #119554: Remove links to and from unsupported socket types #119630

Philipp Oeser commented

2024-04-10 15:29:48 +02:00

@Sergey : regarding the backport of 598819049e : would prefer if you have a look (has conflicts)

@LukasStockner : Will try backporting 1f44be97e6 / d4d5281d45 tomorrow again [ if you like, you can always do yourself as well though :) -- had trouble getting the b9accb676b over to the blender-v3.3-release branch (at least via the gitea UI...) ]

@Sergey : regarding the backport of 598819049e : would prefer if you have a look (has conflicts) @LukasStockner : Will try backporting 1f44be97e6 / d4d5281d45 tomorrow again [ if you like, you can always do yourself as well though :) -- had trouble getting the https://projects.blender.org/blender/blender-test-data/commit/b9accb676b11fdf7b99253fa82b475b58c98d73e over to the blender-v3.3-release branch (at least via the gitea UI...) ]

Sergey Sharybin commented

2024-04-10 17:00:40 +02:00

@lichtwerk Cherry-picked 598819049e, as c118e8716b in the branch. Also updated the task itself.

@lichtwerk Cherry-picked 598819049e, as c118e8716b47a4bfc7dc341f1e9cc26b32077585 in the branch. Also updated the task itself.

👍 1

Philipp Oeser commented

2024-04-11 09:53:05 +02:00

@LukasStockner : Will try backporting 1f44be97e6 / d4d5281d45 tomorrow again [ if you like, you can always do yourself as well though :) -- had trouble getting the b9accb676b over to the blender-v3.3-release branch (at least via the gitea UI...) ]

@LukasStockner : this still doesnt work, we are trying to figure out why in chat, but wouldnt mind if you would join the efforts.
Not the end of the world if these backports are not included in next weeks LTS releases (would be nice though...)

> @LukasStockner : Will try backporting 1f44be97e6 / d4d5281d45 tomorrow again [ if you like, you can always do yourself as well though :) -- had trouble getting the https://projects.blender.org/blender/blender-test-data/commit/b9accb676b11fdf7b99253fa82b475b58c98d73e over to the blender-v3.3-release branch (at least via the gitea UI...) ] @LukasStockner : this still doesnt work, we are trying to figure out why in chat, but wouldnt mind if you would join the efforts. Not the end of the world if these backports are not included in next weeks LTS releases (would be nice though...)

Philipp Oeser commented

2024-04-11 12:18:37 +02:00

@LukasStockner : seems like there were changes in main other than 1f44be97e6 / d4d5281d45 that affected the expected outcome panorama_dicing.png so that would have to be re-rendered from 3.3 with those commits applied. @Sergey also raised the question if we really want a changed render output in LTS (even if it is a bugfix), because we probably wouldnt want studios to have their movie rendered differently when updating to an LTS. Opinions?

@LukasStockner : seems like there were changes in main other than 1f44be97e6 / d4d5281d45 that affected the expected outcome `panorama_dicing.png` so that would have to be re-rendered from 3.3 with those commits applied. @Sergey also raised the question if we really want a changed render output in LTS (even if it is a bugfix), because we probably wouldnt want studios to have their movie rendered differently when updating to an LTS. Opinions?

Lukas Stockner commented

2024-04-11 12:36:27 +02:00

@lichtwerk I can't find the relevant thread in the chat, sorry.
As for including the fix or not: Hm, yeah, good question. On the one hand, it does change the output, but on the other hand, the old output was so broken (for bump maps) that I'd consider it unusable.

@lichtwerk I can't find the relevant thread in the chat, sorry. As for including the fix or not: Hm, yeah, good question. On the one hand, it does change the output, but on the other hand, the old output was so broken (for bump maps) that I'd consider it unusable.

Philipp Oeser commented

2024-04-11 14:37:56 +02:00

@lichtwerk I can't find the relevant thread in the chat, sorry.
As for including the fix or not: Hm, yeah, good question. On the one hand, it does change the output, but on the other hand, the old output was so broken (for bump maps) that I'd consider it unusable.

discussion was in #blender-release

I would say this would have to be decided by the Render & Cycles module then.

Generally speaking, we are discussing being a bit more restrictive wrt backports in the future atm.

> @lichtwerk I can't find the relevant thread in the chat, sorry. > As for including the fix or not: Hm, yeah, good question. On the one hand, it does change the output, but on the other hand, the old output was so broken (for bump maps) that I'd consider it unusable. discussion was in #blender-release I would say this would have to be decided by the `Render & Cycles` module then. Generally speaking, we are discussing being a bit more restrictive wrt backports in the future atm.

Brecht Van Lommel commented

2024-04-15 13:38:07 +02:00

If it's too much trouble to backport, let's just not backport this fix then.

Lukas Stockner commented

2024-04-15 17:32:57 +02:00

If it's too much trouble to backport, let's just not backport this fix then.

Fine with me, I guess if the bug was open for 4 years it's not such a common use case to begin with...

> If it's too much trouble to backport, let's just not backport this fix then. Fine with me, I guess if the bug was open for 4 years it's not such a common use case to begin with...

Philipp Oeser commented

2024-05-13 12:10:28 +02:00

@HooglyBoogly : backporting d66b42e382 had conflicts, prefer if you check

@HooglyBoogly : backporting d66b42e382 had conflicts, prefer if you check

Philipp Oeser referenced this issue

2024-06-11 15:42:59 +02:00

Fix #73168: Stop particle draw code from crashing #123075

Philipp Oeser referenced this issue

2024-06-11 15:50:41 +02:00

Copy to selected doesn't work on certain custom properties (request to backport) #122059

Philipp Oeser commented

2024-07-09 14:03:16 +02:00

@weizhen : you might want to look at 95d11b0d33 yourself (thx in advance!)

@weizhen : you might want to look at 95d11b0d33 yourself (thx in advance!)

Weizhen Huang commented

2024-07-09 14:08:57 +02:00

@lichtwerk 95d11b0d33 should be simple enough to backport? It's just one line + update one image, do you have any difficulty?
For me it's just that I've never backported anything so not familiar with the procedure, and I would need to compile 3.6 from scratch to update the image, but I can try as well.

@lichtwerk 95d11b0d33 should be simple enough to backport? It's just one line + update one image, do you have any difficulty? For me it's just that I've never backported anything so not familiar with the procedure, and I would need to compile 3.6 from scratch to update the image, but I can try as well.

Philipp Oeser commented

2024-07-09 14:41:34 +02:00

@lichtwerk 95d11b0d33 should be simple enough to backport? It's just one line + update one image, do you have any difficulty?
For me it's just that I've never backported anything so not familiar with the procedure, and I would need to compile 3.6 from scratch to update the image, but I can try as well.

@weizhen : if reference/test images change, would prefer to aactually have the dev look at it to make sure the differences are actually the expected ones... (also cant build with CUDA/OPTIX atm. even though that is probably irrelevant, tests are only on CPU by default?)

regarding the procedure: usually I try cherry-picking [which in this case is not possible due to the submodule change] and if there are other conflicts, i try to solve them "by hand" [which in this case could work since it is just that one-liner]. So in this case, the procedure would probably to do it from scratch? Following this and this? Anyhow, like I said before, if tests change, prefer if the dev handles. Again: thx in advance! Let me know if there are other issues with 3.6 that I can possibly help with.

> @lichtwerk 95d11b0d33 should be simple enough to backport? It's just one line + update one image, do you have any difficulty? > For me it's just that I've never backported anything so not familiar with the procedure, and I would need to compile 3.6 from scratch to update the image, but I can try as well. @weizhen : if reference/test images change, would prefer to aactually have the dev look at it to make sure the differences are actually the expected ones... (also cant build with CUDA/OPTIX atm. even though that is probably irrelevant, tests are only on CPU by default?) regarding the procedure: usually I try cherry-picking [which in this case is not possible due to the submodule change] and if there are other conflicts, i try to solve them "by hand" [which in this case could work since it is just that one-liner]. So in this case, the procedure would probably to do it from scratch? Following [this](https://developer.blender.org/docs/handbook/testing/render/) and [this](https://developer.blender.org/docs/handbook/testing/setup/#committing-test-data)? Anyhow, like I said before, if tests change, prefer if the dev handles. Again: thx in advance! Let me know if there are other issues with 3.6 that I can possibly help with.

👍 1

Alaska commented

2024-07-16 18:36:31 +02:00

It seems the fix for #109253 wasn't added to the backport list. Is it safe to add?

Sebastian Parborg modified the milestone from 3.6 LTS to 4.2 LTS

2024-07-17 13:45:40 +02:00

Sebastian Parborg modified the milestone from 4.2 LTS to 3.6 LTS

2024-07-17 13:45:47 +02:00

Sergey Sharybin commented

2024-07-17 14:27:37 +02:00

@Alaska It might be more efficient to talk to developers who made/reviewed/landed the patch. They might not be monitoring the LTS maintenance tasks.

I've talked to Omar, there is no strong opinions about this fix from both of us, but it seems safe to port.

@Alaska It might be more efficient to talk to developers who made/reviewed/landed the patch. They might not be monitoring the LTS maintenance tasks. I've talked to Omar, there is no strong opinions about this fix from both of us, but it seems safe to port.

Philipp Oeser referenced this issue

2024-07-18 10:25:11 +02:00

Colorspace list UI Buggy / Janky #124814

Pratik Borhade referenced this issue

2024-07-26 12:32:38 +02:00

all objects disappear in eevee look dev and render mode #125459

Alaska referenced this issue

2024-09-11 16:43:35 +02:00

Blender 3.6.15 MetalRT - Hiding all objects in rendered viewport crashes #127453

Sign in to join this conversation.