Blender LTS: Maintenance Task 3.3 #100749

New Issue

This task is a management task to track the commits and fixes that will be or are already applied to Blender 3.3 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.3-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 list.

Report	Commits in `main`	Remarks
#101455	`f6c2f1c65e`	depends on `68589a31eb` (not in 3.3)
#101746	`6c4b72b135`	conflicts (some removed function), needs double-checking
#101969	`ea571ddc29`	compile error, requires const bool change from `37533cd6cb`
#98989	`a84c92fc73`	compile errors because of GPU_NODE_TAG_COMPOSITOR
#102346	`9fd6dae793`	WARN! caused #102792
#99592	`bbb389589a`	This contains a UI change, understandable if it's not backport-able
#100952	`8934f00ac5`	conflicts because of `f1c0249f34`
#101130	`51759e6595`	conflicts because of `962b647690`
#103198	`0beb358a69`	conflicts because of `f1c0249f34`
#104898	`19222627c6`	conflicts, seems this got reverted in `3eed00dc54`
#105363	`6d3ce8273a`	had followup issue, needs to be resolved first #106594
#106043	`2a6f177e8e`	had followup issue, needs to be resolved first #106594
	`5532d05622`	Was reported in the add-ons repo blender-addons/issues#104591, but it's a bugfix in Blender itself, has conflicts though
#107745	`98334b8f7d`	`39ba60e88d` has a unit test for that fix, might be nice to back-port too for completeness, has conflicts though
#107906	`b0bef8354d`	conflicts, but when resolved, fix doesnt sem to work, needs further investigation
	`5d695b4f06`
	`02202dd5a1`
#107889	`370b7ae917`
	`3e71220efc`
	`e0732b640a`
	`68e7004e5e`
	`a4aee6a997`
	`86b6aba437`
	`a50768616f`
#107910	`b544199c56`
	`e5c8b92e9c`
#106543	`d58e422ac3`
	`0711bae5e7`
#108161	`51d10f4400`
#88010	`855d8d3fa4`

Blender 3.3.7

Report	Commits in `main`	Commits in LTS	Remarks
#106405	`0bc957063c`	`8f77893d26`
#106934	`6383ed9956`	`a091b545ac`	conflicts, resolved
#90159	`7c927155b5`	`2c92d61761`	conflicts, resolved
#106998	`b0ec4d889a`	`d71b3d9825`	conflicts, resolved
#107125	`45c0762f1b`	`e2ed8fa58a`
#100053	`100f37af49`	`f971417320`
	`5294758830`	`cddcabc409`	conflicts, resolved
#107294	`2f0b166dce`	`4e320104d0`
#107186	`eda88466ee`	`36550a437a`	conflicts, resolved
#107359	`46153f1898` , `30a81f1b55` , `248d81fcbf`	`b685c1cd57`, `3d21d05ea2`, `7269f26de9`
#106776	`5b876b810f`	`c4b2f6fb6a`
	`bd412c9e71`	`ff5038e58d`
#107670	`d6092a6c36`	`63943f83e7`
	`322dab936f`	`e7e359f982`
	`0327d2c963`	`f698b37ba9`	was not reported as bug, but backport has already been requested
#107863	`149d364307`	`e24b575947`
	`d68ed238b9`	`632af7d`
#107573	`ac1ac6be9a`	`14c906caec`
	`4ecbb3f1d5`	`5b9d24221f`

Blender 3.3.6

Report	Commits in `main`	Commits in LTS	Remarks
	`1658b8ab46`	`72a8bab04e`
	`12b001ebce`	`9301513a43`
#106251	`bb2c89b20d`	`5ff9180890`	conflicts (file moved to c++), resolved
#105325	`2fba27e6d8`	`4bb3baddbd`
	`7eda8e5367`	`a9e4c62b41`
#105757	`fa4acbd6be`	`312f954a22`
#105216	`24266fd68c`	`140f6a7a75`
#105339	`2eeec49640`	`b5144f7ec0`
#106396	`58c54b5859`	`9b86f9c32e`
#106394	`792da15d53`	`c2b517950a`
#106794	`022652beb9`	`74ac31e083`

Blender 3.3.5

Report	Commits in `main`	Commits in LTS	Remarks
#99836	`b3f42d8e98` and related	`6494fbbdc5`, `b9d242797b`, `f4b095c872`, `28cb5a3a04`, `02498e8f13`	Used PR #105486.
	`218a909dec`	`23f6baf45b`	conflicts, use this Diff
#104810	`c624e56ffc`	`04da7c1153`
#104347	`69677827ff`	`cb9cd06f06`
#104341	`918cf6cd77`	`0e8080419d`
#105230	`1f6c710463`	`a274713f6c`
#105160	`d66672e17a`	`88dcc0b176`
#104534	`5a20c63975`	`c86cda24a3`

Blender 3.3.4

Report	Commits in `main`	Commits in LTS	Remarks
		`8c7cca66f0`
		`2cec5d8139`
#103881	`a3c38667f0`	`46293e3f97`	conflicts, resolved
#103972	`12a3de9`	`4eab596c3d`
#103400	`93d84e87b2`	`fc61f24f63`
#103887	`6aa29549e8`	`3a0eb79ed0`
#103888	`f72969f377`	`90f06aa48f`
#94752	`d8e01150d6`	`aa2571b8e7`
#104089	`12ca26afc2`	`a1015d2d23`
#104176	`9f866a92dc`	`786286111d`
#104243	`a71ae981c7`	`06bfceeda7`
#90893	`d335db09e0`	`0364607a69`
#88617	`1a13940ef8`	`555eb1e46c`
#104371	`6d297c35c8`	`92213e052b`
#104372	`90f36fc50e`	`bc9a6c858e`
#104026	`51ceeb506f`	`a3c0ff9b74`
#104514	`dc9f7fe64f`	`608916b0e1`
#103903	`efabe81c91`	`4fec780a9f`	needed followup `77963ff778` (`1e16e55f7d`)
	`1c90f8209d`	`581d1f396b`

Blender 3.3.3

Report	Commits in `main`	Commits in LTS	Remarks
#103423	`8d2f4ddb2f`	`4d25c6b86e`
#102670	`461cb550cc`	`4107e04c45`
#102466	`cdc1c60f5b`	`cdfb21c7e2`
#101402	`b918c079da`	`f32939af53`
#101824	`118afe1de3`	`9d3d9019ab`	conflicts (file moved to C++, resolved)
#102503	`d1c21d5673`	`fff29e1bd6`
#102514	`63c4ec89e1`	`a274718e7d`	conflicts, resolved
	`5d481d9e55`	`15b36dc4e6`
#102685	`179008f57a`	`e981a187e5`
	`ee56c46c15`	`f3a10a1543`
	`b0bcdcdbef`	`5940e9b792`	conflicts, resolved
#102663	`5a504a0d9d`	`7a4b3d2287`	conflicts, resolved
#102801	`33ce83984d`	`2bbabbc739`
#102797	`e97443478e`	`a86f32d219`	conflicts, resolved
	`fd9b197226`	`b3e0eadbdc`	conflicts, resolved
	`0361afb165`	`77e66d630a`	conflicts because of `56ae4089eb`, resolved
#102684	`8c82d4cbf6`	`17fd81fb9b`
#102992	`fe30856d83`	`746af98b00`
#102990	`e4f9c50928`	`d2050c7c36`
#103293	`8709a51fa9`	`ae5b912f78`
#103261	`8666791b2e`	`6fbb4d7051`
#102993	`e438e8e04e`	`849c76a10b`
#102612	`93fc352cfa`	`eca95d35ba`
#101850	`603a534`	`427b0a0ab2`
#102942	`b314d92`	`3029bd2b0c`
#95683	`bcc56253e2`	`8529458cc7`
	`fddb76e9af`	`9137a4f03c`
#103303	`d1810d11f4`	`158752cee6`
#102357	`923f394485`	`442ce8610d`
#103234	`e0ef5f3602`	`6aacbdd716`
#103615	`940fd87e77`	`6191b726aa`
	`99dc90accc`	`095b363899`
#102878	`997ff54d30`	`405dd143cf`
	blender/blender-addons@b665525d03	blender/blender-addons@6f4089e1
blender/blender-addons#103203	blender/blender-addons@60299fcc23	blender/blender-addons@b91cc0ca
blender/blender-addons#103455	blender/blender-addons@f131c922f9	blender/blender-addons@16ff2985
#101196	`ed6c8d82b8`	`d6d0643265`
#101964	`f0ebf696cb`	`4ffbc6175e`
#101981	`a67876103a`	`47868c8a4f`	followup fix for `bcc56253e2`
#101501	`cbe1c1474b`	`c3a5a0becf`	build errors "dna_type_offsets.h: No such file or directory", used P3439 on top
#103507	`bc5337a05a`	`faca2c614b`	conflicts, resolved
#103403	`00a20aec07`	`d290b8b2b9`	conflicts, resolved

Blender 3.3.2

Report	Commits in `main`	Commits in LTS	Remarks
#101499	`0458b24a23`	`197f3d75d1`	conflict because of `97746129d5`, resolved
#101447	`957cb173f2`	`295eb04ba3`	conflict because of `95f05a6a4b`, resolved
#100330	`f8a3ec48e4`	`72a34ab1b9`
#101306	`cfa765845b`	`5d820393af`
#101499	`0458b24a23`	`197f3d75d1`	conflict because of `97746129d5`, resolved
#101447	`957cb173f2`	`295eb04ba3`	conflict because of `95f05a6a4b`, resolved
#100330	`f8a3ec48e4`	`72a34ab1b9`
#101306	`cfa765845b`	`5d820393af`
#101334	`634e4a49d6`	`a18b8ba1be`
#101045	`6dd2e193e1`	`cb2fb570f1`
	`51bd26d0fa`	`7e5db850dc`	conflicts because of `b04514da5d`, resolved. This function will be used in future commits fixing GPencil bug
#101591	`0484b6bb18`	`e2beed6ae2`
#101517	`25533ac22d`	`8725bb5108`	Depends on `51bd26d0fa`
	`6d879601b7`	`2a78941d2c`	conflict because of `4baa6e57bd`, resolved
#101492	`a01ab2b4e0`	`85fb4708f4`	conflict because of `23276bcc37`, resolved
#101618	`423c1366b0`	`86f8898ccd`
	`0d0e2dc0a8`	`c98268d3f5`
#100953	`fc0b1627eb`	`6004e9d62b`
	`412d670e9c`	`0b45d3e386`
#101547	`f7a781d45f`	`567e3f6508`	needed above `412d670e9c`
#101025	`21ed3b3258`	`fcc291bbf9`
#101275	`f96b729d7b`	`bfc9d7cadf`	had conflicts because of submodule commit changes, resolved by resetting source/tools to HEAD in blender-v3.3-release
#101685	`bd2f002e71`	`e1e9c83889`
#101702	`aaa731a782`	`7e942b2a1e`
#101651	`95aac5df73`	`3d7f298e9a`
	`f6a6992031`	`07ba515b21`
#101721	`2bacf1cb26`	`7881a797a0`	conflict because of `23276bcc37`, resolved
#101709	`65b42d8c57`	`f9c6e0c814`
#98575	`872a45f42b`	`0386737097`	conflict because of `ea70687dd5`, resolved. Note this did NOT fully fix #98575
#101679	`a379fce14b`	`bb95609fce`
#101776	`99f88281df`	`9f8ece70ee`	used Patch: P3249
#101786	`20dc839319`	`e5af9a12d7`
#99450	`b898330c37`	`1492f566c8`
	`6ad04a031c`	`5ff62df238`
#98672	`0c50f9c4aa`	`30774f01cd`	needed above `6ad04a031c`
#100699	`fabf4ee33d`	`5916e73b28`
#99565	`0a35afb`	`94ec66c2f2`
#101903	`a450a2f2b2`	`514f4e8b47`
#99997	`ead3fc4a07`	`2a7b8e78e1`
	`56d1f07`	`2b2fc6d`
	`21deba5`	`2fb0640`	Also involved various build system improvement commits and lib commits for every platform, but the main thing to mention in release notes is the libraries that were upgraded as listed in these two commits.
	`4269559`	`953eda6`	Also involved various build system improvement commits and lib commits for every platform, but the main thing to mention in release notes is the libraries that were upgraded as listed in these two commits.
#99872		`19202736d5`
#92416	`cacfaaa9a5`	`15b2b53b87`
#101020	`b3daf61ddf`	`b7b9e670ce`
infrastructure/blender-buildbot#88613	`460f7ec7aa`	`2124bfb211`
#101928	`425e7ca342`	`832157cb02`
#94136	`e2a93e9c7c`	`d5acb2b2fe`
#101896	`3d878cd0df`	`be38344de0`
	`09ac5f97a7`	`f07f55582a`
	`bd9d68e4dc`	`0c3a52d571`
#101329	`21fdb0d92b`	`90055a1f2c`
#101946	`9fc000cc6f`	`a49a960a58`
#101933	`2240ca3e7b`	`c5ec667b69`	file was moved to C++, conflict resolved
#99603	`fb424db2b7`	`d2b74943ce`
	`16acd7e473`	`7ce6750234`
#102045	`2186d58d1c`	`b43cfae49c`
#102092	`2625c39ce7`	`9676cb6d8d`
#101062	`3f91540cef`	`6810deb521`
#102018	`f66236a`	`af7dd99588`
#102014	`671c3e1fa4`	`1fd35126c4`
#85870	`82ba205646`	`19a13a8b8b`
#102045	`09faf8a449`	`7a21a49ac5`
#101256	`b70b02ee42`	`036c60a27d`
#101669	`8232cf5`	`ee8d32b1d9`
#100883	`7f6521f`	`198fd56a5e`
	`7c1ab77fa6`	`be34354500`	fixes build error with MSVC 17.4+
#89399	`e4f1d71908`	`29bc410c8a`
#101220	`1df58ec540`	`331de028ef`
#101533	`84d8698488`	`d0e9a8c46a`
#101270	`80f5a5a`	`4f22e6178e`
#102187	`b927cc9ba6`	`92680674d0`
#95335	`d17f5bcd8f`	`c024d6f47d`
#102421	`5f4afec`	`981245fc6f`
	`c0df88f3b5`	`e257e2e075`
#102537	`f7e0317b96`	`f0cd1fed18`
#100926	`4401c93e45`	`5a03d212a9`
	`58795c6047`	`4a7ace4a78`
#100530	`51914d4a4a`	`6008c67859`
#102566	`3e81d177ea`	`4d58a1c657`
#102257	`edc00429e8`	`e968b4197b`
#100891	`c94583c`	`3e41332798`	Fixes both bugs and enables RDNA3 support in LTS
#100969	`88c956c13b`	`2eabe0a320`
	blender/blender-addons@c71c092b75	blender/blender-addons@50a297df
blender/blender-addons#99876	blender/blender-addons@f3975a3bad	blender/blender-addons@80969b3d
	blender/blender-addons@77158558c1	blender/blender-addons@6f168d59
	blender/blender-addons@61ff4faf8c	blender/blender-addons@1c1b05ef
#101925	`1e77769` `0385e4d`	`24c416c` `8dfe5b2`
#102214	`1fbb1d8`	`dd7a10e`
	`2b88ee5`	`021c8c7`	Fixes unreported regression test failures on macOS 13
	`edae67c`	`3e247f0`	Fixes unreported regression test failures on macOS 13
	`e6902d1`	`f9f8340`	Fixes unreported regression test failures on macOS 13
	`193b456`	`86abbf7`	Fixes unreported regression test failures on macOS 13

Blender 3.3.1

Report	Commits in `main`	Commits in LTS	Remarks
	N/A	blender/blender-translations@9f02d935c9	Ultimate update of UI translations
#100918		`7c33d7b4b5`	Fix of issue where NLA strips could not start on a negative frame
#100914		`19ae71c`
#96933	`df75151` `06005b0`	`cb9b6cefb3` `40194f7219`
#88049	`df75151` `06005b0`	`cb9b6cefb3` `40194f7219`
#100714	`e665f0f` `9806672`	`b5ff47667d` `765f987fee`
#100708	`3a605b2`	`50069fb2a1`
#57759	`32d19f7317`	`c0640ddff9`
	`dd19d6456a`	`5e372fca7c`
#99141	`394c0b5ae4`	`8004214356`
	`c1e342136d`	`c25181be4d`
	`9f50bd20eb`	`bcdb90b961`
blender/blender-addons#100669	`67dcdebb3a`	`6133434478`
#96297	`268e1eff8a`	`761da576b0`
#100887	`129993c026`	`faccd88038`
	`e5a7470638`	`568265964e`
#100851	`6d0f8d5a19`	`0a3b6b134c`
#100999	`2d069b609b`	`22c73b36af`
	`16af35054d`	`bf6a9d705f`	See this devtalk thread, and #99618 (Library changes for Blender 3.5)
	`ebcf004`	`ec2938c71a`	cleanup for the above
	`cca416c`	`6143b3ab38`	cleanup for the above
#100886	`bc15c83`	`42937493d8`
#100771	`7518d30f2a`	`440c29f65b`
#101081	`100fe61f7c`	`2a43bb5ed7`	also fixed #100906 (but not #100941 as originally advertised)
#101040	`4b326d5a78`	`52f7d4bbab`
#101000	`2eb19ee`	`b50c1ca8fe`
#101098	`d4a763d363`	`41527ea89c`
#101087	`0bdb5239c1`	`c1f2cd4871`
#100998	`3302b7e6a3`	`55177b40f3`
#101137	`8a9f6a2e0a`	`9b591a104b`
#101001	`22b69ed08f`	`3a880b820b`
	`903709c4eb`	`fe15766f46`	Required by Studios using LTS
#100626	`b999854` `ff8cd48`	`03fbfb3` `609422c`
#101065	`5b216aa`	`5fddc4a`
	`6adb481fb5`	`a920f32`	D16027
	`4cbd799373`	`dba599c806`	needed for `97bd04d665`
	`670ced9758`	`345cdf71e9`	needed for `97bd04d665`
#100797	`97bd04d665`	`07b547ef96`	see two commits above
#100899	`5f4db28c24`	`81ec5ec366`	Other suggested solution was to revert `bbf87c4f75` but `5f4db28c24` seemed safe enough after testing
	blender/blender-addons@ca1dc120e9	blender/blender-addons@ed9b7805
	blender/blender-addons@7c0d4de117	blender/blender-addons@0f1e12d8
	blender/blender-addons@d713da0771	blender/blender-addons@6552dc49
blender/blender-addons#101239	blender/blender-addons@3e6a85eeca	blender/blender-addons@2290fb31
	blender/blender-addons@bb77e697e1	blender/blender-addons@06ad75f3
#101354	`d4fc451`	`cc1105f`
#101365	`8d49a4f`	`6012ded`
#97925	`84ddb8b`	`753dea7`
		blender/blender-addons@4feb92043c	No commit in `main` because attribute export is totally refactored in `main`
blender/blender-addons#101134	blender/blender-addons@e6dcc0b1ca	blender/blender-addons@6565aa5d	applied P3209 for 3.3
#101138	`7f284f5134`	`aa7449e691`
#101034	`f42569bb71`	`5faaaf0982`
#100141	`c172522060`	`4b0243dae4`
#101046	`c350d97a2f`	`0ecc1d788c`
#101109	`eb54502d9d`	`740b501d8b`
#101317	`b6adca3280`	`803d9f9748`
#101370	`530b9841ee`	`b266eedb24`
	`125ac1f914`	`a6c27ea49d`
#101343	`236fda7faf`	`1c8374978d`
	`46cfd345e4`	`b4e8d03e5c`
	`30113e54d2`	`ede6c26222`
#101164	`1cbfe04638`	`24814a03b7`
#101231	`715c86d9e5`	`6c3364052b`
	`ad789c74df`	`662ba67210`
#101347	`2004827bc9`	`93bbaad2f8`
#101341	`ada2b9f6e4`	`5041666321`
	`8ba508d70b`	`cc8df686ad`
#101259	`912a1e2820`	`25cc656003`
#101075	`dcd909122f`	`86538e31f5`
#101487	`7029f11439`	`3f30c1c042`
#101548	`035c237d69`	`1bdb5542ff`
#101564	`83ebf6a811`	`fb499916bb`
#101559	`c3003b4346`	`c3003b4346`
#101598	`fc604a0be3`	`2653775c66`
#101510	`13b3c408e3`	`5a1ef2dc78`
#101233	`4186b0ebe4`	`28e09980a2`

This task is a management task to track the commits and fixes that will be or are already applied to Blender 3.3 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.3-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 list. | **Report** | **Commits in `main`** | **Remarks** | | -- | -- | -- | | #101455 | f6c2f1c65e | depends on 68589a31eb (not in 3.3) | | #101746 | 6c4b72b135 | conflicts (some removed function), needs double-checking | | #101969 | ea571ddc29 | compile error, requires const bool change from 37533cd6cb | | #98989 | a84c92fc73 | compile errors because of GPU_NODE_TAG_COMPOSITOR | | #102346 | 9fd6dae793 | WARN! caused #102792 | | #99592 | bbb389589a | This contains a UI change, understandable if it's not backport-able | | #100952 | 8934f00ac5 | conflicts because of f1c0249f34 | | #101130 | 51759e6595 | conflicts because of 962b647690 | | #103198 | 0beb358a69 | conflicts because of f1c0249f34 | | #104898 | 19222627c6b57df77d3bc9ae60d7850ab7e23abb | conflicts, seems this got reverted in 3eed00dc546b5930b255572901915ccbc26c0e69 | | #105363 | 6d3ce8273a448f20c947e14e71934212202e4c3b | had followup issue, needs to be resolved first #106594 | | #106043 | 2a6f177e8e996834898b2ebbee5344753e458868 | had followup issue, needs to be resolved first #106594 | | | 5532d05622655f8b3ca30b1b252c16f228b13d98 | Was reported in the add-ons repo blender-addons/issues#104591, but it's a bugfix in Blender itself, has conflicts though | | #107745 | 98334b8f7df333abbab63e1aaf340ad8cd9255a9 | 39ba60e88daa5c0a2406b39f107db88ac14c1741 has a unit test for that fix, might be nice to back-port too for completeness, has conflicts though | | #107906 | b0bef8354d896c550003645c031daf17e18d863e | conflicts, but when resolved, fix doesnt sem to work, needs further investigation | | | 5d695b4f0637df199627f876b31f676ddb1d9f72 | | | | 02202dd5a122ce8e32bd352cc46bf525727f9279 | | | #107889 | 370b7ae917678e50914819d37e3c9be9dbc166a5 | | | | 3e71220efcc11afaedb33a1cb2c9d3cd2cb50228 | | | | e0732b640af16668c8bce6fd1cce566912abd7f9 | | | | 68e7004e5ec7e490dadb65a472168b651ad82552 | | | | a4aee6a997 | | | | 86b6aba437 | | | | a50768616f84964f5a47056af027f31e14d0fbbd | | | #107910 | b544199c566bbb9529b5925ce96ae2d2abbf04c1 | | | | e5c8b92e9cd046cc8e567789a0e5999f86498022 | | | #106543 | d58e422ac36f1d151248890ca535c85b7ba39e2c | | | | 0711bae5e704fcb092f445a5e86c76867901f6f7 | | | #108161 | 51d10f440081fd82b2909165b49f532e8704de94 | | | #88010 | 855d8d3fa4 | | ## Blender 3.3.7 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #106405 | 0bc957063ce2d4014d2ecb4c7f06a89cb3147995 | 8f77893d265 | | | #106934 | 6383ed9956cc661cff0ecb16d37e042503b66bfa | a091b545acf | conflicts, resolved | | #90159 | 7c927155b5e70a0c69cdc2ec26405cbc5f5e44f1 | 2c92d617611 | conflicts, resolved | | #106998 | b0ec4d889a766d0fd02ab2d05b6de0ddbd937d68 | d71b3d98255 | conflicts, resolved | | #107125 | 45c0762f1b9b04a49c59a98d30aaa61bdbbc1721 | e2ed8fa58a3 | | | #100053 | 100f37af4926db872d01b1a6db850685e0557290 | f971417320e | | | | 5294758830be77a5f0f07fcc7216fe5d8c9ca192 | cddcabc4093 | conflicts, resolved | | #107294 | 2f0b166dce29c12ec2d5e115d95eb7049f48f253 | 4e320104d0c | | | #107186 | eda88466ee1556b88558f357aea56a792aad1d69 | 36550a437ae | conflicts, resolved | | #107359 | 46153f1898 , 30a81f1b55 , 248d81fcbf | b685c1cd57a, 3d21d05ea2f, 7269f26de9a | | | #106776 | 5b876b810f03ad696b1a1161d41a5fa0dfb8fae4 | c4b2f6fb6ad | | | | bd412c9e71 | ff5038e58d9 | | | #107670 | d6092a6c36 | 63943f83e74 | | | | 322dab936f38cff8a1ae33e1ce349f53b9e9d96e | e7e359f982f | | | | 0327d2c963872227217a02f7e0afa11f44caa537 | f698b37ba9f | was not reported as bug, but backport has already been requested | | #107863 | 149d364307 | e24b575947f | | | | d68ed238b9 | 632af7d | | | #107573 | ac1ac6be9a | 14c906caec0 | | | 4ecbb3f1d5 | 5b9d24221fa9 | ## Blender 3.3.6 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | 1658b8ab46433166af1bcc8e38f12f655d269ca1 | 72a8bab04e337a2d4aba562961875ddc647fee0a | | | | 12b001ebce55b42a1b26caafc27faae7ea973bcf | 9301513a438b17cb1ecf224904658a6b7d8aed70 | | | #106251 | bb2c89b20dd02776c8b2a16829cdd7320d911ece | 5ff9180890d | conflicts (file moved to c++), resolved | | #105325 | 2fba27e6d8876025b1e98d1a6e35d5fac6749a27 | 4bb3baddbd6 | | | | 7eda8e53676795b5f9d8d8fff89f2369bc023821 | a9e4c62b410 | | | #105757 | fa4acbd6be0708d0a145b43a59c862c32b0aa9d9 | 312f954a228 | | | #105216 | 24266fd68c80c267a51a9fa4ce9b0fda228cfbb7 | 140f6a7a751 | | | #105339 | 2eeec49640b3df3f975d947936998cf05443424a | b5144f7ec05 | | | #106396 | 58c54b585923711b5e09e02bad2aced6e51e84bd | 9b86f9c32e2 | | | #106394 | 792da15d5382b3873e96a447ff1b628586956e4d | c2b517950a0 | | | #106794 | 022652beb9bdf5040446da926313cb762cd8f61a | 74ac31e083f | | ## Blender 3.3.5 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #99836 | b3f42d8e98 and related | 6494fbbdc5, b9d242797b, f4b095c872, 28cb5a3a04, 02498e8f13 | Used PR #105486. | | | 218a909dec | 23f6baf45bb | conflicts, use [this Diff](https://projects.blender.org/blender/blender/issues/100749#issuecomment-883936) | | #104810 | c624e56ffce681cdef142e8ace603684e9871663 | 04da7c11533 | | | #104347 | 69677827ff | cb9cd06f061 | | | #104341 | 918cf6cd777a697f1c15043ecb5ec5b8f91765d5 | 0e8080419d3 | | | #105230 | 1f6c710463 | a274713f6c6 | | | #105160 | d66672e17a | 88dcc0b176b | | | #104534 | 5a20c63975 | c86cda24a3b | | ## Blender 3.3.4 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | | 8c7cca66f06b | | | | | 2cec5d8139e | | | #103881 | a3c38667f0 | 46293e3f976 | conflicts, resolved | | #103972 | 12a3de9 | 4eab596c3d0 | | | #103400 | 93d84e87b2 | fc61f24f630 | | | #103887 | 6aa29549e8 | 3a0eb79ed02 | | | #103888 | f72969f377 | 90f06aa48f6 | | | #94752 | d8e01150d6 | aa2571b8e7d | | | #104089 | 12ca26afc2 | a1015d2d235 | | | #104176 | 9f866a92dc | 786286111de | | | #104243 | a71ae981c79a | 06bfceeda72 | | | #90893 | d335db09e0 | 0364607a699 | | | #88617 | 1a13940ef8 | 555eb1e46c0 | | | #104371 | 6d297c35c8 | 92213e052be | | | #104372 | 90f36fc50e | bc9a6c858e5 | | | #104026 | 51ceeb506f | a3c0ff9b740 | | | #104514 | dc9f7fe64f | 608916b0e1d | | | #103903 | efabe81c91 | 4fec780a9f2 | needed followup 77963ff778 (1e16e55f7df) | | | 1c90f8209d | 581d1f396bd3 | | ## Blender 3.3.3 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #103423 | 8d2f4ddb2f | 4d25c6b86e | | | #102670 | 461cb550cc | 4107e04c45 | | | #102466 | cdc1c60f5b | cdfb21c7e2 | | | #101402 | b918c079da | f32939af53 | | | #101824 | 118afe1de3 | 9d3d9019ab | conflicts (file moved to C++, resolved) | | #102503 | d1c21d5673 | fff29e1bd6 | | | #102514 | 63c4ec89e1 | a274718e7d | conflicts, resolved | | | 5d481d9e55 | 15b36dc4e6 | | | #102685 | 179008f57a | e981a187e5 | | | | ee56c46c15 | f3a10a1543 | | | | b0bcdcdbef | 5940e9b792 | conflicts, resolved | | #102663 | 5a504a0d9d | 7a4b3d2287 | conflicts, resolved | | #102801 | 33ce83984d | 2bbabbc739 | | | #102797 | e97443478e | a86f32d219 | conflicts, resolved | | | fd9b197226 | b3e0eadbdc | conflicts, resolved | | | 0361afb165 | 77e66d630a | conflicts because of 56ae4089eb, resolved | | #102684 | 8c82d4cbf6 | 17fd81fb9b | | | #102992 | fe30856d83 | 746af98b00 | | | #102990 | e4f9c50928 | d2050c7c36 | | | #103293 | 8709a51fa9 | ae5b912f78 | | | #103261 | 8666791b2e | 6fbb4d7051 | | | #102993 | e438e8e04e | 849c76a10b | | | #102612 | 93fc352cfa | eca95d35ba | | | #101850 | 603a534 | 427b0a0ab2 | | | #102942 | b314d92 | 3029bd2b0c | | | #95683| bcc56253e2 | 8529458cc7 | | | | fddb76e9af | 9137a4f03c | | | #103303 | d1810d11f4 | 158752cee6 | | | #102357 | 923f394485 | 442ce8610d | | | #103234 | e0ef5f3602 | 6aacbdd716 | | | #103615 | 940fd87e77 | 6191b726aa | | | | 99dc90accc | 095b363899 | | | #102878 | 997ff54d30 | 405dd143cf | | | | blender/blender-addons@b665525d03 | blender/blender-addons@6f4089e1 | | | blender/blender-addons#103203 | blender/blender-addons@60299fcc23 | blender/blender-addons@b91cc0ca | | | blender/blender-addons#103455 | blender/blender-addons@f131c922f9 | blender/blender-addons@16ff2985 | | | #101196 | ed6c8d82b8 | d6d0643265 | | | #101964 | f0ebf696cb | 4ffbc6175e | | | #101981 | a67876103a | 47868c8a4f | followup fix for bcc56253e2 | | #101501 | cbe1c1474b | c3a5a0becf | build errors "dna_type_offsets.h: No such file or directory", used [P3439](https://archive.blender.org/developer/P3439.txt) on top | | #103507 | bc5337a05a | faca2c614b | conflicts, resolved | | #103403 | 00a20aec07 | d290b8b2b9 | conflicts, resolved | ## Blender 3.3.2 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #101499 | 0458b24a23 | 197f3d75d1 | conflict because of 97746129d5, resolved | | #101447 | 957cb173f2 | 295eb04ba3 | conflict because of 95f05a6a4b, resolved | | #100330 | f8a3ec48e4 | 72a34ab1b9 | | | #101306 | cfa765845b | 5d820393af | | | #101499 | 0458b24a23 | 197f3d75d1 | conflict because of 97746129d5, resolved | | #101447 | 957cb173f2 | 295eb04ba3 | conflict because of 95f05a6a4b, resolved | | #100330 | f8a3ec48e4 | 72a34ab1b9 | | | #101306 | cfa765845b | 5d820393af | | | #101334 | 634e4a49d6 | a18b8ba1be | | | #101045 | 6dd2e193e1 | cb2fb570f1 | | | | 51bd26d0fa | 7e5db850dc | conflicts because of b04514da5d, resolved. This function will be used in future commits fixing GPencil bug | | #101591 | 0484b6bb18 | e2beed6ae2 | | | #101517 | 25533ac22d | 8725bb5108 | Depends on 51bd26d0fa | | | 6d879601b7 | 2a78941d2c | conflict because of 4baa6e57bd, resolved | | #101492 | a01ab2b4e0 | 85fb4708f4 | conflict because of 23276bcc37, resolved | | #101618 | 423c1366b0 | 86f8898ccd | | | | 0d0e2dc0a8 | c98268d3f5 | | | #100953 | fc0b1627eb | 6004e9d62b | | | | 412d670e9c | 0b45d3e386 | | | #101547 | f7a781d45f | 567e3f6508 | needed above 412d670e9c | | #101025 | 21ed3b3258 | fcc291bbf9 | | | #101275 | f96b729d7b | bfc9d7cadf | had conflicts because of submodule commit changes, resolved by resetting source/tools to HEAD in blender-v3.3-release | | #101685 | bd2f002e71 | e1e9c83889 | | | #101702 | aaa731a782 | 7e942b2a1e | | | #101651 | 95aac5df73 | 3d7f298e9a | | | | f6a6992031 | 07ba515b21 | | | #101721 | 2bacf1cb26 | 7881a797a0 | conflict because of 23276bcc37, resolved | | #101709 | 65b42d8c57 | f9c6e0c814 | | | #98575 | 872a45f42b | 0386737097 | conflict because of ea70687dd5, resolved. Note this did NOT fully fix #98575 | | #101679 | a379fce14b | bb95609fce | | | #101776 | 99f88281df | 9f8ece70ee | used Patch: [P3249](https://archive.blender.org/developer/P3249.txt) | | #101786 | 20dc839319 | e5af9a12d7 | | | #99450 | b898330c37 | 1492f566c8 | | | | 6ad04a031c | 5ff62df238 | | | #98672 | 0c50f9c4aa | 30774f01cd | needed above 6ad04a031c | | #100699 | fabf4ee33d | 5916e73b28 | | | #99565 | 0a35afb | 94ec66c2f2 | | | #101903 | a450a2f2b2 | 514f4e8b47 | | | #99997 | ead3fc4a07 | 2a7b8e78e1 | | | | 56d1f07 | 2b2fc6d | | | | 21deba5 | 2fb0640 | Also involved various build system improvement commits and lib commits for every platform, but the main thing to mention in release notes is the libraries that were upgraded as listed in these two commits. | | | 4269559 | 953eda6 | Also involved various build system improvement commits and lib commits for every platform, but the main thing to mention in release notes is the libraries that were upgraded as listed in these two commits. | | #99872 | | 19202736d5 | | | #92416 | cacfaaa9a5 | 15b2b53b87 | | | #101020 | b3daf61ddf | b7b9e670ce | | | infrastructure/blender-buildbot#88613 | 460f7ec7aa | 2124bfb211 | | | #101928 | 425e7ca342 | 832157cb02 | | | #94136 | e2a93e9c7c | d5acb2b2fe | | | #101896 | 3d878cd0df | be38344de0 | | | | 09ac5f97a7 | f07f55582a | | | | bd9d68e4dc | 0c3a52d571 | | | #101329 | 21fdb0d92b | 90055a1f2c | | | #101946 | 9fc000cc6f | a49a960a58 | | | #101933 | 2240ca3e7b | c5ec667b69 | file was moved to C++, conflict resolved | | #99603 | fb424db2b7 | d2b74943ce | | | | 16acd7e473 | 7ce6750234 | | | #102045 | 2186d58d1c | b43cfae49c | | | #102092 | 2625c39ce7 | 9676cb6d8d | | | #101062 | 3f91540cef | 6810deb521 | | | #102018 | f66236a | af7dd99588 | | | #102014 | 671c3e1fa4 | 1fd35126c4 | | | #85870 | 82ba205646 | 19a13a8b8b | | | #102045 | 09faf8a449 | 7a21a49ac5 | | | #101256 | b70b02ee42 | 036c60a27d | | | #101669 | 8232cf5 | ee8d32b1d9 | | | #100883 | 7f6521f | 198fd56a5e | | | | 7c1ab77fa6 | be34354500 | fixes build error with MSVC 17.4+ | | #89399 | e4f1d71908 | 29bc410c8a | | | #101220 | 1df58ec540 | 331de028ef | | | #101533 | 84d8698488 | d0e9a8c46a | | | #101270 | 80f5a5a | 4f22e6178e | | | #102187 | b927cc9ba6 | 92680674d0 | | | #95335 | d17f5bcd8f | c024d6f47d | | | #102421 | 5f4afec | 981245fc6f | | | | c0df88f3b5| e257e2e075 | | | #102537 | f7e0317b96 | f0cd1fed18 | | | #100926 | 4401c93e45 | 5a03d212a9 | | | |58795c6047| 4a7ace4a78 | | | #100530 | 51914d4a4a | 6008c67859 | | | #102566 | 3e81d177ea | 4d58a1c657 | | | #102257 | edc00429e8 | e968b4197b | | | #100891 | c94583c | 3e41332798 | Fixes both bugs and enables RDNA3 support in LTS | | #100969 | 88c956c13b | 2eabe0a320 | | | | blender/blender-addons@c71c092b75 | blender/blender-addons@50a297df | | | blender/blender-addons#99876 | blender/blender-addons@f3975a3bad | blender/blender-addons@80969b3d | | | | blender/blender-addons@77158558c1 | blender/blender-addons@6f168d59 | | | | blender/blender-addons@61ff4faf8c | blender/blender-addons@1c1b05ef | | | #101925 | 1e77769 0385e4d | 24c416c 8dfe5b2 | | | #102214 | 1fbb1d8 | dd7a10e | | | | 2b88ee5 | 021c8c7 | Fixes unreported regression test failures on macOS 13 | | | edae67c | 3e247f0 | Fixes unreported regression test failures on macOS 13 | | | e6902d1 | f9f8340 | Fixes unreported regression test failures on macOS 13 | | | 193b456 | 86abbf7 | Fixes unreported regression test failures on macOS 13 | ## Blender 3.3.1 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | N/A | blender/blender-translations@9f02d935c9 | Ultimate update of UI translations | | #100918 | | 7c33d7b4b5 | Fix of issue where NLA strips could not start on a negative frame | | #100914 | | 19ae71c | | | #96933 | df75151 06005b0 | cb9b6cefb3 40194f7219 | | | #88049 | df75151 06005b0 | cb9b6cefb3 40194f7219 | | | #100714 | e665f0f 9806672 | b5ff47667d 765f987fee | | | #100708 | 3a605b2 | 50069fb2a1 | | | #57759 | 32d19f7317 | c0640ddff9 | | | | dd19d6456a | 5e372fca7c | | | #99141 | 394c0b5ae4 | 8004214356 | | | | c1e342136d | c25181be4d | | | | 9f50bd20eb | bcdb90b961 | | | blender/blender-addons#100669 | 67dcdebb3a | 6133434478 | | | #96297 | 268e1eff8a | 761da576b0 | | | #100887 | 129993c026 | faccd88038 | | | | e5a7470638 | 568265964e | | | #100851 | 6d0f8d5a19 | 0a3b6b134c | | | #100999 | 2d069b609b | 22c73b36af | | | | 16af35054d | bf6a9d705f | See [this devtalk thread](https://devtalk.blender.org/t/building-blender-on-linux-using-glibc-2-34-raises-linking-errors-from-the-usd-library/24185), and #99618 (Library changes for Blender 3.5) | | | ebcf004 | ec2938c71a | cleanup for the above | | | cca416c | 6143b3ab38 | cleanup for the above | | #100886 | bc15c83 | 42937493d8 | | | #100771 | 7518d30f2a | 440c29f65b | | | #101081 | 100fe61f7c | 2a43bb5ed7 | also fixed #100906 (but not #100941 as originally advertised) | | #101040 | 4b326d5a78 | 52f7d4bbab | | | #101000 | 2eb19ee | b50c1ca8fe | | | #101098 | d4a763d363 | 41527ea89c | | | #101087 | 0bdb5239c1 | c1f2cd4871 | | | #100998 | 3302b7e6a3 | 55177b40f3 | | | #101137 | 8a9f6a2e0a | 9b591a104b | | | #101001 | 22b69ed08f | 3a880b820b | | | | 903709c4eb | fe15766f46 | Required by Studios using LTS | | #100626 | b999854 ff8cd48 | 03fbfb3 609422c | | | #101065 | 5b216aa | 5fddc4a | | | | 6adb481fb5 | a920f32 | [D16027](https://archive.blender.org/developer/D16027) | | | 4cbd799373 | dba599c806 | needed for 97bd04d665 | | | 670ced9758 | 345cdf71e9 | needed for 97bd04d665 | | #100797 | 97bd04d665 | 07b547ef96 | see two commits above | | #100899 | 5f4db28c24 | 81ec5ec366 | Other suggested solution was to revert bbf87c4f75 but 5f4db28c24 seemed safe enough after testing | | | blender/blender-addons@ca1dc120e9 | blender/blender-addons@ed9b7805 | | | | blender/blender-addons@7c0d4de117 | blender/blender-addons@0f1e12d8 | | | | blender/blender-addons@d713da0771 | blender/blender-addons@6552dc49 | | | blender/blender-addons#101239 | blender/blender-addons@3e6a85eeca | blender/blender-addons@2290fb31 | | | | blender/blender-addons@bb77e697e1 | blender/blender-addons@06ad75f3 | | | #101354 | d4fc451 | cc1105f | | | #101365 | 8d49a4f | 6012ded | | | #97925 | 84ddb8b | 753dea7 | | | | | blender/blender-addons@4feb92043c | No commit in `main` because attribute export is totally refactored in `main` | | blender/blender-addons#101134 | blender/blender-addons@e6dcc0b1ca | blender/blender-addons@6565aa5d | applied [P3209](https://archive.blender.org/developer/P3209.txt) for 3.3 | | #101138 | 7f284f5134 | aa7449e691 | | | #101034 | f42569bb71 | 5faaaf0982 | | | #100141 | c172522060 | 4b0243dae4 | | | #101046 | c350d97a2f | 0ecc1d788c | | | #101109 | eb54502d9d | 740b501d8b | | | #101317 | b6adca3280 | 803d9f9748 | | | #101370 | 530b9841ee | b266eedb24 | | | | 125ac1f914 | a6c27ea49d | | | #101343| 236fda7faf | 1c8374978d | | | | 46cfd345e4 | b4e8d03e5c | | | | 30113e54d2 | ede6c26222 | | | #101164 | 1cbfe04638 | 24814a03b7 | | | #101231 | 715c86d9e5 | 6c3364052b | | | | ad789c74df | 662ba67210 | | | #101347 | 2004827bc9 | 93bbaad2f8 | | | #101341 | ada2b9f6e4 | 5041666321 | | | | 8ba508d70b | cc8df686ad | | | #101259 | 912a1e2820 | 25cc656003 | | | #101075 | dcd909122f | 86538e31f5 | | | #101487 | 7029f11439 | 3f30c1c042 | | | #101548 | 035c237d69 | 1bdb5542ff | | | #101564 | 83ebf6a811 | fb499916bb | | | #101559 | c3003b4346 | c3003b4346 | | | #101598 | fc604a0be3 | 2653775c66 | | | #101510 | 13b3c408e3 | 5a1ef2dc78 | | | #101233 | 4186b0ebe4 | 28e09980a2 | |

Changed status from 'Needs Triage' to: 'Confirmed'

Added subscriber: @ThomasDinges

#100848 was marked as duplicate of this issue

Added subscriber: @JulienDuroure

Added subscriber: @PratikPB2123

Added subscriber: @Harvester

Added subscriber: @lichtwerk

Added subscriber: @SteffenD

Added subscriber: @MWillcox24

Added subscriber: @ChengduLittleA

Added subscribers: @aras_p, @antoniov

@aras_p , @antoniov : reg. 97bd04d665 : do you want the other two commits in LTS as well? or can provide an alternative patch specifically for LTS?

@aras_p , @antoniov : reg. 97bd04d665 : do you want the other two commits in LTS as well? or can provide an alternative patch specifically for LTS?

Added subscriber: @mano-wii

@mano-wii : reg. "Suggested solution is to revert bbf87c4f75": can you elaborate? Is 5f4db28c24 enough?

@mano-wii : reg. "Suggested solution is to revert bbf87c4f75": can you elaborate? Is 5f4db28c24 enough?

Added subscriber: @ideasman42

In #100749#1420615, @lichtwerk wrote:
@mano-wii : reg. "Suggested solution is to revert bbf87c4f75": can you elaborate? Is 5f4db28c24 enough?

It was a suggested solution to avoid other possible issues. See comment in #100899

In #100899#1417104, @ideasman42 wrote:
(...)
Note that as this error is in 3.3 release, suggest to revert bbf87c4f75 there, and apply the fix from @mano-wii in master.

So we have two options to resolve the issue in 3.3:

apply 5f4db28c24 or
revert bbf87c4f75

Reverting seemed safer at the time, but soon after users tested the fix in a variety of ways, so cherry-picking 5f4db28c24 doesn't seem so unsafe anymore.

> In #100749#1420615, @lichtwerk wrote: > @mano-wii : reg. "Suggested solution is to revert bbf87c4f75": can you elaborate? Is 5f4db28c24 enough? It was a suggested solution to avoid other possible issues. See comment in #100899 > In #100899#1417104, @ideasman42 wrote: > (...) > Note that as this error is in 3.3 release, suggest to revert bbf87c4f75 there, and apply the fix from @mano-wii in master. So we have two options to resolve the issue in 3.3: - apply 5f4db28c24 or - revert bbf87c4f75 Reverting seemed safer at the time, but soon after users tested the fix in a variety of ways, so cherry-picking 5f4db28c24 doesn't seem so unsafe anymore. ---

In #100749#1420602, @lichtwerk wrote:
@aras_p , @antoniov : reg. 97bd04d665 : do you want the other two commits in LTS as well? or can provide an alternative patch specifically for LTS?

@lichtwerk I think either approach is fine. Looking at the two dependent commits, you could (with some squinting) say they are also bugfixes (user selects multiple files in the file dialog, only one gets imported). The code in both commits sounds simple enough to me to not pose a risk. My vote would be thus on taking the other two commits as well. If anyone objects, then I can backport just the final commit manually with adjustments into the LTS branch.

> In #100749#1420602, @lichtwerk wrote: > @aras_p , @antoniov : reg. 97bd04d665 : do you want the other two commits in LTS as well? or can provide an alternative patch specifically for LTS? @lichtwerk I think either approach is fine. Looking at the two dependent commits, you could (with some squinting) say they are also bugfixes (user selects multiple files in the file dialog, only one gets imported). The code in both commits sounds simple enough to me to not pose a risk. My vote would be thus on taking the other two commits as well. If anyone objects, then I can backport just the final commit manually with adjustments into the LTS branch.

In #100749#1420718, @mano-wii wrote:
Reverting seemed safer at the time, but soon after users tested the fix in a variety of ways, so cherry-picking 5f4db28c24 doesn't seem so unsafe anymore.

applied 5f4db28c24 then

> In #100749#1420718, @mano-wii wrote: > Reverting seemed safer at the time, but soon after users tested the fix in a variety of ways, so cherry-picking 5f4db28c24 doesn't seem so unsafe anymore. applied 5f4db28c24 then

In #100749#1420720, @aras_p wrote:
@lichtwerk I think either approach is fine. Looking at the two dependent commits, you could (with some squinting) say they are also bugfixes (user selects multiple files in the file dialog, only one gets imported). The code in both commits sounds simple enough to me to not pose a risk. My vote would be thus on taking the other two commits as well. If anyone objects, then I can backport just the final commit manually with adjustments into the LTS branch.

took all three commits now

> In #100749#1420720, @aras_p wrote: > @lichtwerk I think either approach is fine. Looking at the two dependent commits, you could (with some squinting) say they are also bugfixes (user selects multiple files in the file dialog, only one gets imported). The code in both commits sounds simple enough to me to not pose a risk. My vote would be thus on taking the other two commits as well. If anyone objects, then I can backport just the final commit manually with adjustments into the LTS branch. took all three commits now

@mano-wii reg. blender/blender-addons@e6dcc0b1ca : in 3.3 I am getting the following when exportingthe UV layout with the patch:

Traceback (most recent call last):
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/__init__.py", line 137, in execute
    export(filepath, polygon_data, different_colors, self.size[0], self.size[1], self.opacity)
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 17, in export
    draw_image(face_data, opacity)
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 37, in draw_image
    draw_lines(face_data)
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 84, in draw_lines
    batch = batch_for_shader(shader, 'LINES', {"pos": coords})
  File "/build_linux/bin/3.3/scripts/modules/gpu_extras/batch.py", line 39, in batch_for_shader
    vbo.attr_fill(id, data)
ValueError: Expected a sequence of size 2, got 3

shader changed again in blender/blender-addons@5578ae83b? Should we use POLYLINE_UNIFORM_COLOR in 3.3 as well?

@mano-wii reg. blender/blender-addons@e6dcc0b1ca : in 3.3 I am getting the following when exportingthe UV layout with the patch: ``` Traceback (most recent call last): File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/__init__.py", line 137, in execute export(filepath, polygon_data, different_colors, self.size[0], self.size[1], self.opacity) File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 17, in export draw_image(face_data, opacity) File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 37, in draw_image draw_lines(face_data) File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 84, in draw_lines batch = batch_for_shader(shader, 'LINES', {"pos": coords}) File "/build_linux/bin/3.3/scripts/modules/gpu_extras/batch.py", line 39, in batch_for_shader vbo.attr_fill(id, data) ValueError: Expected a sequence of size 2, got 3 ``` shader changed again in blender/blender-addons@5578ae83b? Should we use `POLYLINE_UNIFORM_COLOR` in 3.3 as well?

In #100749#1421050, @lichtwerk wrote:
@mano-wii reg. blender/blender-addons@e6dcc0b1ca : in 3.3 I am getting the following when exportingthe UV layout with the patch:

Traceback (most recent call last):
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/__init__.py", line 137, in execute
    export(filepath, polygon_data, different_colors, self.size- [x], self.size- [x], self.opacity)
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 17, in export
    draw_image(face_data, opacity)
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 37, in draw_image
    draw_lines(face_data)
  File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 84, in draw_lines
    batch = batch_for_shader(shader, 'LINES', {"pos": coords})
  File "/build_linux/bin/3.3/scripts/modules/gpu_extras/batch.py", line 39, in batch_for_shader
    vbo.attr_fill(id, data)
ValueError: Expected a sequence of size 2, got 3

This error message is unexpected. the branch must be at a time when the coordinates were 3D. I need to look carefully...

shader changed again in blender/blender-addons@5578ae83b? Should we use POLYLINE_UNIFORM_COLOR in 3.3 as well?

POLYLINE_UNIFORM_COLOR only exists in 3.4 if I'm not mistaken.

> In #100749#1421050, @lichtwerk wrote: > @mano-wii reg. blender/blender-addons@e6dcc0b1ca : in 3.3 I am getting the following when exportingthe UV layout with the patch: > > ``` > Traceback (most recent call last): > File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/__init__.py", line 137, in execute > export(filepath, polygon_data, different_colors, self.size- [x], self.size- [x], self.opacity) > File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 17, in export > draw_image(face_data, opacity) > File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 37, in draw_image > draw_lines(face_data) > File "/build_linux/bin/3.3/scripts/addons/io_mesh_uv_layout/export_uv_png.py", line 84, in draw_lines > batch = batch_for_shader(shader, 'LINES', {"pos": coords}) > File "/build_linux/bin/3.3/scripts/modules/gpu_extras/batch.py", line 39, in batch_for_shader > vbo.attr_fill(id, data) > ValueError: Expected a sequence of size 2, got 3 > ``` This error message is unexpected. the branch must be at a time when the coordinates were 3D. I need to look carefully... > shader changed again in blender/blender-addons@5578ae83b? Should we use `POLYLINE_UNIFORM_COLOR` in 3.3 as well? `POLYLINE_UNIFORM_COLOR` only exists in 3.4 if I'm not mistaken.

Removed subscriber: @aras_p

Removed subscriber: @antoniov

Added subscriber: @antoniov

@antoniov: please check the issue mentioned at the top about the failing commit.

@lichtwerk What you do in the cases? edit manually the changes and commit manually?

In #100749#1426905, @antoniov wrote:
@lichtwerk What you do in the cases? edit manually the changes and commit manually?

If you have a patch that would work in 3.3, you can provide a Paste of the Diff here
we could also skip the backport for 3.3

> In #100749#1426905, @antoniov wrote: > @lichtwerk What you do in the cases? edit manually the changes and commit manually? - If you have a patch that would work in 3.3, you can provide a [Paste ](https://developer.blender.org/paste/) of the Diff here - we could also skip the backport for 3.3

In #100749#1427015, @lichtwerk wrote:

In #100749#1426905, @antoniov wrote:
@lichtwerk What you do in the cases? edit manually the changes and commit manually?

If you have a patch that would work in 3.3, you can provide a Paste of the Diff here

we could also skip the backport for 3.3

https://developer.blender.org/P3232

> In #100749#1427015, @lichtwerk wrote: >> In #100749#1426905, @antoniov wrote: >> @lichtwerk What you do in the cases? edit manually the changes and commit manually? > > - If you have a patch that would work in 3.3, you can provide a [Paste ](https://developer.blender.org/paste/) of the Diff here > - we could also skip the backport for 3.3 https://developer.blender.org/P3232

Removed subscriber: @antoniov

Added subscriber: @brecht

Added subscriber: @iss

@xavierh : backporting 1c90f8209d, I get conflicts because of 0c824837ab (at least). Mind checking (got a patch specifically for 3.3)?

@xavierh : backporting 1c90f8209d, I get conflicts because of 0c824837ab (at least). Mind checking (got a patch specifically for 3.3)?

@antoniov @filedescriptor : same as in #88449, backporting 218a909dec gives conflicts (because of the move to C++, cleanups -- can you provide a patch for 3.3?)

@antoniov @filedescriptor : same as in #88449, backporting 218a909dec gives conflicts (because of the move to C++, cleanups -- can you provide a patch for 3.3?)

@antoniov @filedescriptor : same as in #88449, backporting 218a909dec gives conflicts (because of the move to C++, cleanups -- can you provide a patch for 3.3?)

I guess this patch will work for 3.3 and maybe for 2.9x

> @antoniov @filedescriptor : same as in #88449, backporting 218a909dec gives conflicts (because of the move to C++, cleanups -- can you provide a patch for 3.3?) I guess this patch will work for 3.3 and maybe for 2.9x

Fix_33.diff

2.8 KiB

@xavierh : backporting 1c90f8209d, I get conflicts because of 0c824837ab (at least). Mind checking (got a patch specifically for 3.3)?

@lichtwerk sure, here is a PR for 3.3: #104781

> @xavierh : backporting 1c90f8209d, I get conflicts because of 0c824837ab (at least). Mind checking (got a patch specifically for 3.3)? @lichtwerk sure, here is a PR for 3.3: https://projects.blender.org/blender/blender/pulls/104781

@xavierh : backporting 1c90f8209d, I get conflicts because of 0c824837ab (at least). Mind checking (got a patch specifically for 3.3)?

@lichtwerk sure, here is a PR for 3.3: #104781

Thx! updated the list then.

> > @xavierh : backporting 1c90f8209d, I get conflicts because of 0c824837ab (at least). Mind checking (got a patch specifically for 3.3)? > > @lichtwerk sure, here is a PR for 3.3: https://projects.blender.org/blender/blender/pulls/104781 Thx! updated the list then.

I guess this patch will work for 3.3 and maybe for 2.9x

I didnt get to it in time for 3.3.4 / 2.93.15, will put in the following dot release

> I guess this patch will work for 3.3 and maybe for 2.9x I didnt get to it in time for 3.3.4 / 2.93.15, will put in the following dot release

@brecht : backporting d68ed238b9 had conflicts I'd rather have you take a look
@mont29 : backporting ac1ac6be9a had conflicts I'd rather have you take a look
@dr.sybren : backporting 5532d05622, 98334b8f7d had conflicts I'd rather have you take a look

Feel free to just commit to the branch on your own.

@brecht : backporting d68ed238b9 had conflicts I'd rather have you take a look @mont29 : backporting ac1ac6be9a had conflicts I'd rather have you take a look @dr.sybren : backporting 5532d05622, 98334b8f7d had conflicts I'd rather have you take a look Feel free to just commit to the branch on your own.

Ok, d68ed238b9 was backported.

Ok, d68ed238b9b72bc228818d45146116f930c15787 was backported.

Thanks, ac1ac6be9a has been backported, as well as 4ecbb3f1d5.

Thanks, ac1ac6be9a has been backported, as well as 4ecbb3f1d5.

Download

What's New

Blender Studio

Manual

Developers Blog

Documentation

Benchmark

Blender Conference

Development Fund

One-time Donations

Blender LTS: Maintenance Task 3.3 #100749