blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Blender LTS: Maintenance Task 3.3 #100749

New Issue
Open
opened 2022-09-01 15:02:39 +02:00 by Thomas Dinges · 65 comments
Thomas Dinges commented 2022-09-01 15:02:39 +02:00
Owner
Copy Link

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 To Be Backported list (not the Blender 3.3.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
#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
#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
#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 seem to work, needs further investigation
a60c1e5bb8 not easily possible, outliner_do_libdata_operation_selection_set() changed along the way
#109438 56e9abf133 credits_git_gen.py moved places, not sure how to handle this in LTS...
df0d6d0022 not easily possible, LIBOVERRIDE_OP_FLAG_IDPOINTER_MATCH_REFERENCE is not even declared
6dd51353dd not easily possible
#109781 04a07d5e08 that bug is not in 3.3 actually
e1b1b2a8b4 that assert s not in 3.3 actually
#110464 dce2368b8c conflicts because of 8b9a3b94fc, so probably not going to be backported, would also need 931467cbd5
#110204 c275f4219f conflicts because of 4f3e2ee857, might not be backported
#110108 bd305c8d18 conflicts, prefer if @ChrisLend checks not backporting due to conflicts and follow up bug
#113798 eed4f950d8 depends on 0a0a29887d / 4c99043a85, so probably not going to be backported
#104926 66dc0ebf2e conflicts, do we need something like eb23b299db ontop as well?, probably better to not backport, see @HooglyBoogly comment below...
#56355 1f44be97e6 conflicts (because of tests/data)
d4d5281d45 conflicts, depends on the above ^^
#120748 f72dbc1ef8

Blender 3.3.18

Report Commits in main Commits in LTS Remarks
#118299 88ba4dfaa3 eb1b028c14 done by @mont29
#118300 da101d8cdb cdb6e15b62 done by @mont29
6adf5adb7f fef97afbad done by @mont29, some non-trivial differences from main commit
#118137 1e478cf169 b9add3302b conflicts, resolved
#119275 2d49cc597f c32f7ea887
#110751 f771a8563b 87d9c9387b
#120007 598819049e 1d5ef2d1c6

Blender 3.3.17

Report Commits in main Commits in LTS Remarks
N/A ea10be4dd6 d78a01b8a9 Update install_deps.sh to include Git LFS
N/A N/A 6481bf32b3, f3bceefdb7 Switch SVN to Git submodules using Git-LFS
#117586 b10507ab63 603b88f188
#117485 1e44d811ac f13ebb09de conflicts, resolved
#101227 a060e96103 ee0e7d0667 conflicts, resolved
af953514e7 387d383666
281e45ec30 a7ae75235f
#118225 1a2edde400 1c48ca5080
#105968 8675fc50dc 50fa1ea259
#102930 d2f8af9b08 ba49d103a5
0a173b942b 25cee646ad
659f05ef28 a3445a4529
#117795 05af72fc2e, 71df742eb4 093f80f85a, 2e8241b407 conflicts, resolved
#119142 021565d867 6fa8cb09d4 conflicts, resolved
#119106 2191cbf7f5 a09d18da72
#114552 5d1d447c2b 7fb3b8cb2b

Blender 3.3.16

Report Commits in main Commits in LTS Remarks
268f93d763 e10b2fc1a3 conflicts, resolved, used 5b9dcbdb8c/4a2a6f1fa4c on top
#97431 d0359d066d 94b359d1f2 conflicts, resolved
#106425 4da32e9334 1925c62d5f conflicts, resolved
#68436 c16b0216fe 20880d002e build errors, resolved
#117526 a324a19f1b 8ee0333602 conflicts, resolved
#117530 37e89714ff 2498b9b212
#54554 f23da882e6 6bd9b1f189 conflicts, resolved
0053de6556 6fba82404d conflicts, resolved
#108407 d38824bc02 b58bcc0922
#108407 401a2397db 5b79fc9885 Fixes mistake in d38824bc02
#118055 711e4cdd94 6d39e78438 Use !118364 instead

Blender 3.3.15

Report Commits in main Commits in LTS Remarks
#114582 7981b35064 d663c05721
d2e91fb0d7 9673fa2720
4c527b095a 80e39f14e4
#92621 e503536775 17f972f066 conflicts, resolved
#114282 4bec9d0d71 511c6d813b

Blender 3.3.14

Report Commits in main Commits in LTS Remarks
#113325 697114c4b6 6b09a0277b
#114557 ed556113ce 843b3b3705 conflicts, resolved
#115363 09be0915c3 19a03bd66e
d2e91fb0d7 9673fa2720

Blender 3.3.13

Report Commits in main Commits in LTS Remarks
#112935 534e7f4470 9e09f60cf2
#113461 09046e8121 3952869b90
#113323 40ea1cdb97 b0a752bb8f
5cf3654d9d 127f76751d conflicts, resolved
#113310 4cedbb9cb7 b740c59d5d
#107920 3cb659faa8 012b7db0fe conflicts, resolved
#112683 19b112b11c 3123f0746d build errors, resolved
b7b74385cd a5c81e124c
#114152 67445c2353 b79bd0e322
#114430 9c2164ba7c 838eb4177a conflicts, resolved
#113810 bb8cb4e56f 7835ff066b
#114216 e7ad3af301 d2791d71df conflicts, resolved
#114358 0a3b44ed64 eb70a77cad
#114363 0eb279de54 40bff85670 conflicts, resolved
#109430 5974a4482a 1c1159eb2d
#114685 270fc860cf 2a8623fd59 conflicts, resolved

Blender 3.3.12

Report Commits in main Commits in LTS Remarks
#101550 59e8be7aa4 fa4913061c conflicts, resolved
#97628 057de815ef 68d05d0112 conflicts, resolved
#113002 2d864846e4 610f9134d8 conflicts, resolved
N/A 5f7f6b65f3 7a52b9161b conflicts, resolved

Blender 3.3.11

Report Commits in main Commits in LTS Remarks
#111235 N/A b7c4972ebc Only affecting LTS releases
b075c84ba3 ae9665bc44
blender/blender-addons#104723 blender/blender-addons@35824c38e3 blender/blender-addons@8f1ff60f
fea567651b 2d482f482a support GCC 13
e8d1d1486e a66d09f2b5 support GCC 13
a37ff68334 9d9db7852d conflicts, resolved
#110085 c4fb34a3f7 1cdd83bf9d
#110723 4cefe0ec80 da6c1e1ccf conflicts, resolved
#111277 7f65080ab4 ee2e231adc In Blender 3.5+, this fixes two errors (visual artifacts and errors on the GPU when using the light tree). In Blender 3.3 it only fixes one (visual artifacts) because 3.3 doesn't have the light tree. The commit message should be adjusted to represent that
#111238 8bae4427ed 5eafbc7c6e
#94129 e2a35debde a423ebad48 conflicts, resolved
#109427 b4c380acb4 895702f803 conflicts, resolved
#111642 f77fdbff8a b4a34d54f7 conflicts, resolved
#112208 84b4b90e08 662fd4213c conflicts, resolved
#112144 52cfa67f6f 6cdff49851
88b125e75d 6368ffe636 Fix for regression tests failure when Xcode 14.3 is used

Blender 3.3.10

Report Commits in main Commits in LTS Remarks
#109781 babc650779 6bc0bc8c4a
#106139 742ada97e2 70b382100a
#110341 126fd4a181 af100b768b
#110426 b3223d3f4f d24b8322a0
#109151 0896cae97c 815111c47b Used fast-forward merge of !110574
#109151 830730e2cc d4ebd222a5 Used fast-forward merge of !110574
#109151 a1d7ec7139 51eb9f1205 Used fast-forward merge of !110574
#109151 05243a4206 51eb9f1205 Used fast-forward merge of !110574
#109151 aecf6dd1db 4d3dda2222 Used fast-forward merge of !110574
a14c747fe8 2ddfb23cb6 conflicts, resolved
5dfd3e3c28 90381c879c conflicts, resolved
blender/blender-addons@08ec3386cd blender/blender-addons@9b131677

Blender 3.3.9

Report Commits in main Commits in LTS Remarks
#109198 258ba398ed fdd8568a7d
#109302 128c95438f 0976c7bdfe conflicts, resolved
#109562 2ee0c23a82 b510f68a67
18efd11369 0250791fdb
#109898 53e1bae929 e328a237df
9889d0ef6f b3520818ac If possible
#109928 9c9664c823 d0ec3d7b56 conflicts, resolved
#109822 ac3f4e959f 359e96167c conflicts, resolved
#110821 300cfecc46 1b1c790345

Blender 3.3.8

Report Commits in main Commits in LTS Remarks
480a6bc94d
blender/blender-addons#104660 blender/blender-addons@61b4a06564 blender/blender-addons@13f245011a
5d695b4f06 c02d0fe8a8
02202dd5a1 dd33c9109f
#107889 370b7ae917 de67b139c4 conflicts, resolved
a4aee6a997 03035404e2
86b6aba437 d62f93b3ea
a50768616f ca660b09fb
#107910 b544199c56 7547ea3f66
e5c8b92e9c 10c9bd3e32
0711bae5e7 789f6911f5
#108161 51d10f4400 07dd11c941
#88010 855d8d3fa4 952ba34097
#108501 9d00d13767 a861981826
#106966 9735b8ee71 a7c50f4213
79837c5ed4 d7deddfc96
57f7721ffc 03c74c71e7
c1d353c17b 4b8e980848
#98973 6948a2d613 f3c45f5b5a f43e4ff62c a7f18fe78e
c99dd96731 d4e360b526
#104597 a7afce347d 1b450d1528 build errors, resolved
#108980 ea3cbf4942 5e22b3901b
#105942 da052ab9f6 4166fee49d conflicts, resolved
#108911 d61d2e5f59 1eae929349
#106543 d58e422ac3 8ad46d94b8 build errors, resolved
5532d05622 fcaa5cab85 Was reported in the add-ons repo blender-addons/issues#104591
f3be425e97 0dcef23ebc Was reported in the add-ons repo blender/blender-addons#104591
3e71220efc edf31df7e8
e0732b640a 7227e11f21
68e7004e5e 11c94fcb23

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
#110161 5b3398a673
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 `To Be Backported` list (**not** the `Blender 3.3.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** | | -- | -- | -- | | #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 | | #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 | | #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 seem to work, needs further investigation | | | a60c1e5bb81 | not easily possible, outliner_do_libdata_operation_selection_set() changed along the way | | #109438 | 56e9abf133 | credits_git_gen.py moved places, not sure how to handle this in LTS... | | | df0d6d0022 | not easily possible, LIBOVERRIDE_OP_FLAG_IDPOINTER_MATCH_REFERENCE is not even declared | | | 6dd51353dd | not easily possible | | #109781 | 04a07d5e08cb27fc8edc1b75eae81f2bbad53c98 | that bug is not in 3.3 actually | | | e1b1b2a8b4 | that assert s not in 3.3 actually | | #110464 | dce2368b8cfc3a780a505467c22202e05804a5bd | conflicts because of 8b9a3b94fc148d197b137aa892855c60db2783e6, so probably not going to be backported, would also need 931467cbd5 | | #110204 | c275f4219f1482c0a89b0f91179058d60c007643 | conflicts because of 4f3e2ee857, might not be backported | | #110108 | bd305c8d18442ec056b84b889f604e0abeef8ea6 | ~~conflicts, prefer if @ChrisLend checks~~ not backporting due to conflicts and follow up bug | | #113798 | eed4f950d826d0f27ccf1f1b36fc12ebe432bbf3 | depends on 0a0a29887d / 4c99043a85, so probably not going to be backported | | #104926 | 66dc0ebf2eb7e572991dc32d5cbab56b9d2f571f | conflicts, do we need something like eb23b299db7559b815c86b6cf1f23f3b8b6db187 ontop as well?, probably better to not backport, see @HooglyBoogly comment below... | | #56355 | 1f44be97e6712e04ade2ca88c320a80d19267cf8 | conflicts (because of tests/data) | | | d4d5281d45820ef95ef3783082bf4ad2b8adab38 | conflicts, depends on the above ^^ | | #120748 | f72dbc1ef887de2ee44cc70d1e3f7a3e92bd8d02 | | ## Blender 3.3.18 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #118299 | 88ba4dfaa3 | eb1b028c14 | done by @mont29 | | #118300 | da101d8cdb | cdb6e15b62 | done by @mont29 | | | 6adf5adb7f | fef97afbad | done by @mont29, some non-trivial differences from `main` commit | | #118137 | 1e478cf169890d5bb285d5688b17a0443605e5f0 | b9add3302ba | conflicts, resolved | | #119275 | 2d49cc597f2c03c9e52cfdfd8629077dee5054b4 | c32f7ea887f | | | #110751 | f771a8563bb21d545961718f6f8029f57f27402e | 87d9c9387b3 | | | #120007 | 598819049e7d664023e34bc97db7ec5caa6e5ead | 1d5ef2d1c658be62b4d0acb5d7bdf597e40f2505 | | ## Blender 3.3.17 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | N/A | ea10be4dd6 | d78a01b8a9 | Update `install_deps.sh` to include Git LFS | | N/A | N/A | 6481bf32b37, f3bceefdb76 | Switch SVN to Git submodules using Git-LFS | | #117586 | b10507ab63 | 603b88f188aba1326bae5637885c2945611a1801 | | | #117485 | 1e44d811ac3a64df57fe6958d0d08a86472b3e71 | f13ebb09de865016310695bc9fe1bb825c95cdeb | conflicts, resolved | | #101227 | a060e96103e8189ca92a4327a69a754a9cf75dba | ee0e7d0667180f59706eedcd0cad1fe6d1cce531 | conflicts, resolved | | | af953514e75089f4079913248c1818c3ab049308 | 387d38366638656ca82560b744841d51b9c38a92 | | | | 281e45ec30f42d70424207747193b95d504455e5 | a7ae75235f50b1b9d4293b2e220a520ecc2adfa8 | | | #118225 | 1a2edde4009dcd3034849c1823f6df71c01d474f | 1c48ca50803 | | | #105968 | 8675fc50dcc07e0a6a8675400413e862c90e1693 | 50fa1ea2595 | | | #102930 | d2f8af9b08d8691cd8a75b740c18e230730807b6 | ba49d103a5c | | | | 0a173b942bf26e188e1ae14c972ba31d98954601 | 25cee646ad5 | | | | 659f05ef28d075a725c0703ab2712c30838d9023 | a3445a45290 | | | #117795 | 05af72fc2e, 71df742eb4 | 093f80f85a4, 2e8241b4073 | conflicts, resolved | | #119142 | 021565d867ce455a7c55fae63ffbd5e1d51420c9 | 6fa8cb09d4e | conflicts, resolved | | #119106 | 2191cbf7f561b8fa0363c20e703b55a6e1cfe9bf | a09d18da724 | | | #114552 | 5d1d447c2b | 7fb3b8cb2be | | ## Blender 3.3.16 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | 268f93d7639b152612a6667c338f88f5cbbf1d13 | e10b2fc1a3cee6f0a802cd853a0be3dc788204f9 | conflicts, resolved, used 5b9dcbdb8c/4a2a6f1fa4c on top | | #97431 | d0359d066db9001df16c1fa6ab46393151231649 | 94b359d1f2f | conflicts, resolved | | #106425 | 4da32e933443c1f7b02c2eb064b77c060c33658c | 1925c62d5f7 | conflicts, resolved | | #68436 | c16b0216fec5886e5500846ddc83e17b0147301c | 20880d002e9d5b44e5eb990fd45b7cca4b859b1f | build errors, resolved | | #117526 | a324a19f1bc71f50052725fd10847f303b5536e0 | 8ee03336028 | conflicts, resolved | | #117530 | 37e89714ff1ca11e77376b39d22b65f50a34ec3e | 2498b9b212d | | #54554 | f23da882e63da8db614debe3aa8a7039904ef276 | 6bd9b1f189e | conflicts, resolved | | | 0053de65567435422444ea7696a657d2e8fc9f21 | 6fba82404d9 | conflicts, resolved | | #108407 | d38824bc02 | b58bcc09227 | | | #108407 | 401a2397db | 5b79fc9885f | Fixes mistake in d38824bc02 | | #118055 | 711e4cdd94 | 6d39e78438d5f47bc1105f088b6c850107dc51f7 | Use !118364 instead | ## Blender 3.3.15 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #114582 | 7981b350648b63c17cdebcd825eb5c53423de58a | d663c05721bbc4f4b60855649f831e6ef0a0ff12 | | | | d2e91fb0d72fe565e6fcab9a1c071dce83aca0db | 9673fa2720b99d935e69f3c3d9ef0a0d61c2e3cf | | | | 4c527b095a5282dc4b8024ae7f724c84eb00da40 | 80e39f14e45 | | | #92621 | e5035367750c95519d376a99625cfae4f80d0b00 | 17f972f0663 | conflicts, resolved | | #114282 | 4bec9d0d7162b0ca321cee5987c086c10319d65f | 511c6d813b6 | | ## Blender 3.3.14 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #113325 | 697114c4b64fe053178898478e0afe2d90f77955 | 6b09a0277b5 | | | #114557 | ed556113cea2f82c6a98d75ce3a9600f0ebb1a1b | 843b3b3705f | conflicts, resolved | | #115363 | 09be0915c3f526a12dda1ce48f1dbaad382a093b | 19a03bd66e0 | | | | d2e91fb0d72fe565e6fcab9a1c071dce83aca0db | 9673fa2720b99d935e69f3c3d9ef0a0d61c2e3cf | | ## Blender 3.3.13 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #112935 | 534e7f4470caa6794ef856bd8f5d7d62af197614 | 9e09f60cf27 | | | #113461 | 09046e81212a1aa823e6ee90c5f935dc9d365b3d | 3952869b909 | | | #113323 | 40ea1cdb97c15ca034d3e243d654062c9216e79a | b0a752bb8f1 | | | | 5cf3654d9d | 127f76751db | conflicts, resolved | | #113310 | 4cedbb9cb7 | b740c59d5d7 | | | #107920 | 3cb659faa87c583d2f410ea6bac3c6d6c4b8ee92 | 012b7db0feb | conflicts, resolved | | #112683 | 19b112b11c79ad2a7ab1cc01d7c1595db0482933 | 3123f0746d41 | build errors, resolved | | | b7b74385cdb11b0068805f5e7c2850510cd06ca9 | a5c81e124cc | | | #114152 | 67445c2353 | b79bd0e3229 | | | #114430 | 9c2164ba7c | 838eb4177a4 | conflicts, resolved | | #113810 | bb8cb4e56f0bd0963e1583a9d333f98e32719c56 | 7835ff066be | | | #114216 | e7ad3af301851c2f547d2a6bc44e2937476aa0c7 | d2791d71df0 | conflicts, resolved | | #114358 | 0a3b44ed64c134aaa8e2c3e96218fa53737d8bdc | eb70a77cad6 | | | #114363 | 0eb279de54ffbfe574b9b61c767b17ebbc53b911 | 40bff856700 | conflicts, resolved | | #109430 | 5974a4482a39d43aa5f380b56a57a1b4113a9997 | 1c1159eb2d8 | | | #114685 | 270fc860cf436e4667efaadd00d682715cef48a8 | 2a8623fd59f | conflicts, resolved | ## Blender 3.3.12 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #101550 | 59e8be7aa4e2fc6b887e8e616c3433d6ac46e66f | fa4913061c8 | conflicts, resolved | | #97628 | 057de815ef0f0c1a970fd053632f19d757ef660e | 68d05d01123 | conflicts, resolved | | #113002 | 2d864846e4ba9d23706c63bf221fecfa45c0c6bd | 610f9134d85 | conflicts, resolved | | N/A | 5f7f6b65f3d88cb2952847de06e852062f9904de | 7a52b9161b4 | conflicts, resolved | ## Blender 3.3.11 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #111235 | N/A | b7c4972ebc | Only affecting LTS releases | | | b075c84ba3 | ae9665bc44 | | | blender/blender-addons#104723 | blender/blender-addons@35824c38e32b74e24274cd7f41cc4dc8f5bd88cb | blender/blender-addons@8f1ff60f | | | | fea567651b5d | 2d482f482a7 | support GCC 13 | | | e8d1d1486e3d | a66d09f2b5a | support GCC 13 | | | a37ff683348f7a1122e3a742da0e6219aed9c7c5 | 9d9db7852d2 | conflicts, resolved | | #110085 | c4fb34a3f740a54d0ad1662e018bdec3e393d3c8 | 1cdd83bf9d1 | | | #110723 | 4cefe0ec809f7345291c24e08a259c553a8545e5 | da6c1e1ccf1 | conflicts, resolved | | #111277 | 7f65080ab4cf37b725a719e5b8a789e63fa4878a | ee2e231adc4b3ee138a26f013a286c9fa3be3e8c | In Blender 3.5+, this fixes two errors (visual artifacts and errors on the GPU when using the light tree). In Blender 3.3 it only fixes one (visual artifacts) because 3.3 doesn't have the light tree. The commit message should be adjusted to represent that | | #111238 | 8bae4427edb641cb0df57760211683a0696ac66f | 5eafbc7c6e3 | | | #94129 | e2a35debde3e58d9bb21e802e1469ac95451b632 | a423ebad487 | conflicts, resolved | | #109427 | b4c380acb433eddfeb3e7ebee7efcff9c3ce308d | 895702f8039 | conflicts, resolved | | #111642 | f77fdbff8a90ab510c6044f9fd0587342371ed52 | b4a34d54f78 | conflicts, resolved | | #112208 | 84b4b90e08ca6f19f3511f99fe803db940d19a8a | 662fd4213c2 | conflicts, resolved | | #112144 | 52cfa67f6fc8fd21247a4931bbeb1523c32188a1 | 6cdff498515 | | | | 88b125e75d6e82926d30b8a7f70ef5c3812ea2de | 6368ffe636043d463744175fd1e504d32e8f73d6 | Fix for regression tests failure when Xcode 14.3 is used | ## Blender 3.3.10 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #109781 | babc6507799958d29e61b21cb7ae59c54a25a46d | 6bc0bc8c4ad | | | #106139 | 742ada97e2 | 70b382100a5 | | | #110341 | 126fd4a18161ce14e7417c072ad9bd3f283e319d | af100b768b9 | | | #110426 | b3223d3f4f540f3ce7c512eaf449733976029bf9 | d24b8322a0e | | | #109151 | 0896cae97c | 815111c47b5b8b8f928fdc57ef88e42df6b169a3 | Used fast-forward merge of !110574 | | #109151 | 830730e2cc | d4ebd222a5b38c6de8384cf273be343853fac92f | Used fast-forward merge of !110574 | | #109151 | a1d7ec7139 | 51eb9f1205ebe22ff6d16935ee24ff75ad235ff7 | Used fast-forward merge of !110574 | | #109151 | 05243a4206 | 51eb9f1205ebe22ff6d16935ee24ff75ad235ff7 | Used fast-forward merge of !110574 | | #109151 | aecf6dd1db | 4d3dda222241931a2684964bdbd8447655cd80e6 | Used fast-forward merge of !110574 | | | a14c747fe8 | 2ddfb23cb6f | conflicts, resolved | | | 5dfd3e3c28 | 90381c879c6 | conflicts, resolved | | | blender/blender-addons@08ec3386cdbb3f64ff8a6f14ba8e204eb631402b | blender/blender-addons@9b131677 | | ## Blender 3.3.9 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #109198 | 258ba398ed | fdd8568a7d6 | | | #109302 | 128c95438fe8a9929244f8803261844f51e0729e | 0976c7bdfeb | conflicts, resolved | | #109562 | 2ee0c23a82d54595e5e30fa30074f239bcbfd0a5 | b510f68a674 | | | | 18efd11369840a8289f7c373df14de96aad0d6e0 | 0250791fdb2 | | | #109898 | 53e1bae929014fda573b270bc88e7df9e3b20fb8 | e328a237dff | | | | 9889d0ef6f | b3520818ac4 | If possible | | #109928 | 9c9664c823343efb0f0bc29e2158b128c365d216 | d0ec3d7b568 | conflicts, resolved | | #109822 | ac3f4e959f5908b3a48a55e0e02a07794c31ae46 | 359e96167c7 | conflicts, resolved | | #110821 | 300cfecc46f3cf712fbee0961eaf504ef45a58f9 | 1b1c790345f | | ## Blender 3.3.8 | **Report** | **Commits in `main`** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | | 480a6bc94d | | | blender/blender-addons#104660 | blender/blender-addons@61b4a065649e587042953d3443c17ded11f18459 | blender/blender-addons@13f245011a286bac6cbcb153d943630504a174af | | | | 5d695b4f0637df199627f876b31f676ddb1d9f72 | c02d0fe8a89 | | | | 02202dd5a122ce8e32bd352cc46bf525727f9279 | dd33c9109fd | | | #107889 | 370b7ae917678e50914819d37e3c9be9dbc166a5 | de67b139c48f4ee033da7ad1fff823effb64da97 | conflicts, resolved | | | a4aee6a997 | 03035404e28 | | | | 86b6aba437 | d62f93b3eaf | | | | a50768616f84964f5a47056af027f31e14d0fbbd | ca660b09fb5 | | | #107910 | b544199c566bbb9529b5925ce96ae2d2abbf04c1 | 7547ea3f669 | | | | e5c8b92e9cd046cc8e567789a0e5999f86498022 | 10c9bd3e327 | | | | 0711bae5e704fcb092f445a5e86c76867901f6f7 | 789f6911f51 | | | #108161 | 51d10f440081fd82b2909165b49f532e8704de94 | 07dd11c9416 | | | #88010 | 855d8d3fa4 | 952ba34097e | | | #108501 | 9d00d1376726 | a8619818262 | | | #106966 | 9735b8ee719efac2c15c75064cc3889799acf616 | a7c50f42131 | | | | 79837c5ed4 | d7deddfc963 | | | | 57f7721ffc31fe96aa4bdb8c48e853629ca656a1 | 03c74c71e79 | | | | c1d353c17b33971523dd4aab540091c6418d790f | 4b8e9808482 | | | #98973 | 6948a2d6134ef19ae326e98a60aa33cb1f5deedd f3c45f5b5ab35cffcda3cb03744958e8fc541c66 | f43e4ff62c0 a7f18fe78e2 | | | | c99dd96731 | d4e360b5262 | | | #104597 | a7afce347d | 1b450d1528c24e1f140de8f435635f70bf25bf66 | build errors, resolved | | #108980 | ea3cbf49425b3b5e2bc8d1ffbe4bb8bad3328185 | 5e22b3901b2 | | | #105942 | da052ab9f6915f24f45ed080206e9c940d4d9a14 | 4166fee49df | conflicts, resolved | | #108911 | d61d2e5f59cf21d87a31abfc394f55a39da86592 | 1eae9293498 | | | #106543 | d58e422ac36f1d151248890ca535c85b7ba39e2c | 8ad46d94b8c0 | build errors, resolved | | | 5532d05622655f8b3ca30b1b252c16f228b13d98 | fcaa5cab85 | Was reported in the add-ons repo blender-addons/issues#104591 | | | f3be425e9724146959a4c25a34536422ebf858a6 | 0dcef23ebc | Was reported in the add-ons repo blender/blender-addons#104591 | | | 3e71220efcc11afaedb33a1cb2c9d3cd2cb50228 | edf31df7e891a9a9e479ba9e65108db9626340d9 | | | | e0732b640af16668c8bce6fd1cce566912abd7f9 | 7227e11f213d08e753bc381b3a94748a12a060de | | | | 68e7004e5ec7e490dadb65a472168b651ad82552 | 11c94fcb234856629b3bb3b433656d1fde8ceddd | | ## 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 | | | #110161 | 5b3398a673 | |
👍 1
Thomas Dinges commented 2022-09-01 15:02:39 +02:00
Author
Owner
Copy Link

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

Changed status from 'Needs Triage' to: 'Confirmed'
Thomas Dinges commented 2022-09-01 15:02:39 +02:00
Author
Owner
Copy Link

Added subscriber: @ThomasDinges

Added subscriber: @ThomasDinges
blender-admin commented 2022-09-01 15:02:39 +02:00
Copy Link

#100848 was marked as duplicate of this issue

#100848 was marked as duplicate of this issue
Julien Duroure commented 2022-09-01 15:20:03 +02:00
Member
Copy Link

Added subscriber: @JulienDuroure

Added subscriber: @JulienDuroure
Pratik Borhade commented 2022-09-02 02:21:27 +02:00
Member
Copy Link

Added subscriber: @PratikPB2123

Added subscriber: @PratikPB2123
Riccardo Giovanetti commented 2022-09-03 08:55:35 +02:00
Copy Link

Added subscriber: @Harvester

Added subscriber: @Harvester
Philipp Oeser commented 2022-09-06 09:17:48 +02:00
Member
Copy Link

Added subscriber: @lichtwerk

Added subscriber: @lichtwerk
Steffen Dünner commented 2022-09-06 15:33:17 +02:00
Copy Link

Added subscriber: @SteffenD

Added subscriber: @SteffenD
Michael Willcox commented 2022-09-13 21:08:13 +02:00
Copy Link

Added subscriber: @MWillcox24

Added subscriber: @MWillcox24
YimingWu commented 2022-09-18 03:51:14 +02:00
Member
Copy Link

Added subscriber: @ChengduLittleA

Added subscriber: @ChengduLittleA
Philipp Oeser commented 2022-09-21 12:13:31 +02:00
Member
Copy Link

Added subscribers: @aras_p, @antoniov

Added subscribers: @aras_p, @antoniov
Philipp Oeser commented 2022-09-21 12:13:31 +02:00
Member
Copy Link

@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?
Philipp Oeser commented 2022-09-21 12:38:59 +02:00
Member
Copy Link

Added subscriber: @mano-wii

Added subscriber: @mano-wii
Philipp Oeser commented 2022-09-21 12:38:59 +02:00
Member
Copy Link

@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?
Germano Cavalcante commented 2022-09-21 14:37:50 +02:00
Member
Copy Link

Added subscriber: @ideasman42

Added subscriber: @ideasman42
Germano Cavalcante commented 2022-09-21 14:37:50 +02:00
Member
Copy Link

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:

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. ---
Aras Pranckevicius commented 2022-09-21 14:42:49 +02:00
Member
Copy Link

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.
Philipp Oeser commented 2022-09-22 09:31:41 +02:00
Member
Copy Link

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
Philipp Oeser commented 2022-09-22 09:32:40 +02:00
Member
Copy Link

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
Philipp Oeser commented 2022-09-22 11:02:10 +02:00
Member
Copy Link

@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?
Germano Cavalcante commented 2022-09-22 13:42:17 +02:00
Member
Copy Link

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.
Aras Pranckevicius commented 2022-09-23 06:01:30 +02:00
Member
Copy Link

Removed subscriber: @aras_p

Removed subscriber: @aras_p
Antonio Vazquez commented 2022-09-23 09:11:07 +02:00
Member
Copy Link

Removed subscriber: @antoniov

Removed subscriber: @antoniov
Philipp Oeser commented 2022-10-03 12:51:18 +02:00
Member
Copy Link

Added subscriber: @antoniov

Added subscriber: @antoniov
Philipp Oeser commented 2022-10-03 12:51:18 +02:00
Member
Copy Link

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

@antoniov: please check the issue mentioned at the top about the failing commit.
Antonio Vazquez commented 2022-10-03 15:38:25 +02:00
Member
Copy Link

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

@lichtwerk What you do in the cases? edit manually the changes and commit manually?
Philipp Oeser commented 2022-10-03 21:23:38 +02:00
Member
Copy Link

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
Antonio Vazquez commented 2022-10-03 22:16:29 +02:00
Member
Copy Link

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
Antonio Vazquez commented 2022-10-05 13:59:45 +02:00
Member
Copy Link

Removed subscriber: @antoniov

Removed subscriber: @antoniov
Philipp Oeser commented 2022-11-28 14:23:21 +01:00
Member
Copy Link

Added subscriber: @brecht

Added subscriber: @brecht
Philipp Oeser commented 2023-01-12 22:28:34 +01:00
Member
Copy Link

Added subscriber: @iss

Added subscriber: @iss
Thomas Dinges added this to the 3.3 LTS milestone 2023-02-08 15:37:17 +01:00
Bastien Montagne added reference blender-v3.3-release 2023-02-09 15:25:03 +01:00
Philipp Oeser self-assigned this 2023-02-11 09:46:53 +01:00
Philipp Oeser commented 2023-02-15 14:03:33 +01:00
Member
Copy Link

@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)?
Philipp Oeser commented 2023-02-15 14:04:54 +01:00
Member
Copy Link

@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?)
Antonio Vazquez commented 2023-02-15 14:24:49 +01:00
Member
Copy Link

@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
Xavier Hallade commented 2023-02-15 14:34:24 +01:00
Member
Copy Link

@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
Philipp Oeser commented 2023-02-15 15:26:59 +01:00
Member
Copy Link

@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.
Philipp Oeser commented 2023-02-17 10:24:06 +01:00
Member
Copy Link

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
Philipp Oeser commented 2023-05-15 15:00:26 +02:00
Member
Copy Link

@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.
Brecht Van Lommel commented 2023-05-15 15:33:14 +02:00
Owner
Copy Link

Ok, d68ed238b9 was backported.

Ok, d68ed238b9b72bc228818d45146116f930c15787 was backported.
Bastien Montagne commented 2023-05-16 10:40:43 +02:00
Owner
Copy Link

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

Thanks, ac1ac6be9a has been backported, as well as 4ecbb3f1d5.
Brad-Smith commented 2023-06-10 05:47:14 +02:00
Contributor
Copy Link

Please add 79837c5ed4 for newer Boost compatbility.

Please add 79837c5ed4b57925bf6c6bb9e7c2248f6f52bbb0 for newer Boost compatbility.
Sybren A. Stüvel commented 2023-06-12 13:06:39 +02:00
Member
Copy Link

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

It would seem you've already managed to backport those, thanks!

> @dr.sybren : backporting 5532d05622, 98334b8f7d had conflicts I'd rather have you take a look It would seem you've already managed to backport those, thanks!
Philipp Oeser commented 2023-06-12 13:57:00 +02:00
Member
Copy Link

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

It would seem you've already managed to backport those, thanks!

Have I? Dont think these are in 3.3 already, are they?

> > @dr.sybren : backporting 5532d05622, 98334b8f7d had conflicts I'd rather have you take a look > > It would seem you've already managed to backport those, thanks! Have I? Dont think these are in 3.3 already, are they?
Philipp Oeser commented 2023-06-15 15:10:28 +02:00
Member
Copy Link

@ZedDB : could you handle 3e71220efc, e0732b640a & 68e7004e5e in 3.3 yourself?

@ZedDB : could you handle 3e71220efc, e0732b640a & 68e7004e5e in 3.3 yourself?
Philipp Oeser commented 2023-06-15 15:11:22 +02:00
Member
Copy Link

@JulianEisel : could you handle d58e422ac3 in 3.3 yourself?

@JulianEisel : could you handle d58e422ac36f1d151248890ca535c85b7ba39e2c in 3.3 yourself?
Julian Eisel commented 2023-06-15 16:11:53 +02:00
Member
Copy Link

@JulianEisel : could you handle d58e422ac3 in 3.3 yourself?

Done in 8ad46d94b8. Updated the table, anything else I should do?

> @JulianEisel : could you handle d58e422ac36f1d151248890ca535c85b7ba39e2c in 3.3 yourself? Done in 8ad46d94b8c0. Updated the table, anything else I should do?
Sebastian Parborg commented 2023-06-15 19:16:33 +02:00
Member
Copy Link

@ZedDB : could you handle 3e71220efc, e0732b640a & 68e7004e5e in 3.3 yourself?

I'll try to get it done tomorrow.

> @ZedDB : could you handle 3e71220efc, e0732b640a & 68e7004e5e in 3.3 yourself? I'll try to get it done tomorrow.
Sybren A. Stüvel commented 2023-06-16 11:02:58 +02:00
Member
Copy Link

Have I? Dont think these are in 3.3 already, are they?

🙈 3.3, Sybren, 3.3. Not 3.6.

Now 5532d05622 is in, without conflicts as I also cherry-picked f3be425e97 first. That's also solving a crash, so good to have in 3.3 as well.

98334b8f7d does not have to be back-ported to 3.3, as it fixes an issue that was introduced in a later release.

> Have I? Dont think these are in 3.3 already, are they? 🙈 3.3, Sybren, 3.3. Not 3.6. Now 5532d05622 is in, without conflicts as I also cherry-picked f3be425e9724146959a4c25a34536422ebf858a6 first. That's also solving a crash, so good to have in 3.3 as well. 98334b8f7d does not have to be back-ported to 3.3, as it fixes an issue that was introduced in a later release.
Philipp Oeser commented 2023-06-16 11:12:45 +02:00
Member
Copy Link

Thx @dr.sybren (I added the branch commits to the table as well) , Thx @JulianEisel (nothing more to to do)

Thx @dr.sybren (I added the branch commits to the table as well) , Thx @JulianEisel (nothing more to to do)
Sebastian Parborg commented 2023-06-16 15:40:34 +02:00
Member
Copy Link

@ZedDB : could you handle 3e71220efc, e0732b640a & 68e7004e5e in 3.3 yourself?

Done :)

> @ZedDB : could you handle 3e71220efc, e0732b640a & 68e7004e5e in 3.3 yourself? Done :)
Sybren A. Stüvel commented 2023-09-07 14:19:14 +02:00
Member
Copy Link

I removed "#101130 / 51759e6595". It had conflicts because of 962b647690, and was deemed too risky to work around those conflicts.

I removed "#101130 / 51759e6595". It had conflicts because of 962b647690, and was deemed too risky to work around those conflicts.
Philipp Oeser commented 2023-10-12 14:15:08 +02:00
Member
Copy Link

@ChrisLend : backporting bd305c8d18 had conflicts, would prefer if you check (you can create a PR targeting the 3.3-release branch and drop a link as a remark)

@ChrisLend : backporting bd305c8d18 had conflicts, would prefer if you check (you can create a PR targeting the 3.3-release branch and drop a link as a remark)
Christoph Lendenfeld commented 2023-10-12 15:24:57 +02:00
Member
Copy Link

@lichtwerk taking this off the backport list since it turned out to have caused another bug with scaling. It's a bit too risky to backport to 3.3 at this point

@lichtwerk taking this off the backport list since it turned out to have caused another bug with scaling. It's a bit too risky to backport to 3.3 at this point
Philipp Oeser commented 2024-01-10 12:04:20 +01:00
Member
Copy Link

@deadpin : backporting 268f93d763 has conflicts (BLI_SCOPED_DEFER can be used in C++ only?), can you come up with a PR targeting the 3.3 branch? Or drop that commit from backporting?

@deadpin : backporting 268f93d763 has conflicts (`BLI_SCOPED_DEFER` can be used in C++ only?), can you come up with a PR targeting the 3.3 branch? Or drop that commit from backporting?
Campbell Barton commented 2024-01-10 13:53:07 +01:00
Owner
Copy Link

@lichtwerk 268f93d763 & 5b9dcbdb8c avoids using BLI_SCOPED_DEFER.

@lichtwerk 268f93d763 & 5b9dcbdb8c9271b6 avoids using `BLI_SCOPED_DEFER`.
Philipp Oeser commented 2024-01-10 14:10:28 +01:00
Member
Copy Link

@lichtwerk 268f93d763 & 5b9dcbdb8c avoids using BLI_SCOPED_DEFER.

So it is just 5b9dcbdb8c on top, right?

> @lichtwerk 268f93d763 & 5b9dcbdb8c9271b6 avoids using `BLI_SCOPED_DEFER`. So it is just 5b9dcbdb8c9271b6 on top, right?
Campbell Barton commented 2024-01-11 00:50:15 +01:00
Owner
Copy Link

@lichtwerk yes.

@lichtwerk yes.
Philipp Oeser commented 2024-02-14 17:10:47 +01:00
Member
Copy Link

@mont29 : backporting 711e4cdd94 had conflicts (see comment at top), you mind want to check
@HooglyBoogly : backporting 66dc0ebf2e had conflicts (see comment at top), you mind want to check

@mont29 : backporting 711e4cdd94 had conflicts (see comment at top), you mind want to check @HooglyBoogly : backporting 66dc0ebf2e had conflicts (see comment at top), you mind want to check
Hans Goudey commented 2024-02-14 17:14:55 +01:00
Member
Copy Link

I think it's fine not to backport that one TBH. It behaved like that for a long time and there was imperfect versioning to correct the issue in 4.1.

I think it's fine not to backport that one TBH. It behaved like that for a long time and there was imperfect versioning to correct the issue in 4.1.
👍 1
Bastien Montagne commented 2024-02-14 18:07:52 +01:00
Owner
Copy Link

@lichtwerk aaaaaah the good old days, when code was simple and full of macros...

Seriously, this patch should work for 3.3: https://projects.blender.org/mont29/.profile/src/branch/main/paste_buffer/118055_v3.3.diff

@lichtwerk aaaaaah the good old days, when code was simple and full of macros... Seriously, this patch should work for 3.3: https://projects.blender.org/mont29/.profile/src/branch/main/paste_buffer/118055_v3.3.diff
Philipp Oeser commented 2024-02-16 08:59:14 +01:00
Member
Copy Link

@lichtwerk aaaaaah the good old days, when code was simple and full of macros...

Seriously, this patch should work for 3.3: https://projects.blender.org/mont29/.profile/src/branch/main/paste_buffer/118055_v3.3.diff

Ah, OK, can you make a quick PR for this? (just makes it more transparent compared to me committing this on your behalf)

> @lichtwerk aaaaaah the good old days, when code was simple and full of macros... > > Seriously, this patch should work for 3.3: https://projects.blender.org/mont29/.profile/src/branch/main/paste_buffer/118055_v3.3.diff Ah, OK, can you make a quick PR for this? (just makes it more transparent compared to me committing this on your behalf)
👍 1
Philipp Oeser commented 2024-03-12 16:29:36 +01:00
Member
Copy Link

@mont29 : same as in #109399, would prefer if you could check on the last backports marked in the To Be Backported section, thx in advance!

@mont29 : same as in #109399, would prefer if you could check on the last backports marked in the **To Be Backported** section, thx in advance!
Brad-Smith commented 2024-03-25 02:47:19 +01:00
Contributor
Copy Link

Please add 94e2973f0b. Only the first file applies.

Please add 94e2973f0b04f34637c69554d0af8d6aa6c1b44d. Only the first file applies.
Sebastian Parborg modified the milestone from 3.3 LTS to 4.1 2024-03-29 19:49:50 +01:00
Sebastian Parborg modified the milestone from 4.1 to 3.3 LTS 2024-03-29 19:50:04 +01:00
Philipp Oeser commented 2024-04-10 15:30:50 +02:00
Member
Copy Link

@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 16:57:29 +02:00
Owner
Copy Link

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

@lichtwerk Cherry-picked 598819049e, as 1d5ef2d1c658be62b4d0acb5d7bdf597e40f2505 in the branch. Also updated the task itself.
👍 1
Sign in to join this conversation.
blender-v3.3-release
Branches Tags
Clear current reference
main
brush-assets-project
blender-v4.1-release
blender-v3.3-release
blender-v3.6-release
universal-scene-description
blender-v3.6-temp_wmoss_animrig_public
temp-sculpt-dyntopo
gpencil-next
anim/animation-id-113594
blender-v4.0-release
blender-projects-basics
bridge-curves
sculpt-blender
asset-browser-frontend-split
asset-shelf
tmp-usd-python-mtl
tmp-usd-3.6
blender-v3.5-release
blender-v2.93-release
realtime-clock
sculpt-dev
bevelv2
xr-dev
Clear current reference
v4.1.1
v3.6.11
v3.3.18
v4.1.0
v3.3.17
v3.6.10
v3.6.9
v3.3.16
v3.6.8
v3.6.7
v3.3.14
v4.0.2
v4.0.1
v4.0.0
v3.6.5
v3.3.12
v3.6.4
v3.6.3
v3.3.11
v3.6.2
v3.3.10
v3.6.1
v3.3.9
v3.6.0
v3.3.8
v3.3.7
v2.93.18
v3.5.1
v3.3.6
v2.93.17
v3.5.0
v2.93.16
v3.3.5
v3.3.4
v2.93.15
v2.93.14
v3.3.3
v2.93.13
v2.93.12
v3.4.1
v3.3.2
v3.4.0
v3.3.1
v2.93.11
v3.3.0
v3.2.2
v2.93.10
v3.2.1
v3.2.0
v2.83.20
v2.93.9
v3.1.2
v3.1.1
v3.1.0
v2.83.19
v2.93.8
v3.0.1
v2.93.7
v3.0.0
v2.93.6
v2.93.5
v2.83.18
v2.93.4
v2.93.3
v2.83.17
v2.93.2
v2.93.1
v2.83.16
v2.93.0
v2.83.15
v2.83.14
v2.83.13
v2.92.0
v2.83.12
v2.91.2
v2.83.10
v2.91.0
v2.83.9
v2.83.8
v2.83.7
v2.90.1
v2.83.6.1
v2.83.6
v2.90.0
v2.83.5
v2.83.4
v2.83.3
v2.83.2
v2.83.1
v2.83
v2.82a
v2.82
v2.81a
v2.81
v2.80
v2.80-rc3
v2.80-rc2
v2.80-rc1
v2.79b
v2.79a
v2.79
v2.79-rc2
v2.79-rc1
v2.78c
v2.78b
v2.78a
v2.78
v2.78-rc2
v2.78-rc1
v2.77a
v2.77
v2.77-rc2
v2.77-rc1
v2.76b
v2.76a
v2.76
v2.76-rc3
v2.76-rc2
v2.76-rc1
v2.75a
v2.75
v2.75-rc2
v2.75-rc1
v2.74
v2.74-rc4
v2.74-rc3
v2.74-rc2
v2.74-rc1
v2.73a
v2.73
v2.73-rc1
v2.72b
2.72b
v2.72a
v2.72
v2.72-rc1
v2.71
v2.71-rc2
v2.71-rc1
v2.70a
v2.70
v2.70-rc2
v2.70-rc
v2.69
v2.68a
v2.68
v2.67b
v2.67a
v2.67
v2.66a
v2.66
v2.65a
v2.65
v2.64a
v2.64
v2.63a
v2.63
v2.61
v2.60a
v2.60
v2.59
v2.58a
v2.58
v2.57b
v2.57a
v2.57
v2.56a
v2.56
v2.55
v2.54
v2.53
v2.52
v2.51
v2.50
v2.49b
v2.49a
v2.49
v2.48a
v2.48
v2.47
v2.46
v2.45
v2.44
v2.43
v2.42a
v2.42
v2.41
v2.40
v2.37a
v2.37
v2.36
v2.35a
v2.35
v2.34
v2.33a
v2.33
v2.32
v2.31a
v2.31
v2.30
v2.28c
v2.28a
v2.28
v2.27
v2.26
v2.25
Labels
Clear labels   
Interest
Alembic

  
Interest
Animation & Rigging

  
Interest
Asset Browser

  
Interest
Asset Browser Project Overview

  
Interest
Audio

  
Interest
Automated Testing

  
Interest
Blender Asset Bundle

  
Interest
BlendFile

  
Interest
Collada

  
Interest
Compatibility
This issue affects/is about backward or forward compatibility

  
Interest
Compositing

  
Interest
Core

  
Interest
Cycles

  
Interest
Dependency Graph

  
Interest
Development Management

  
Interest
EEVEE

  
Interest
EEVEE & Viewport

  
Interest
Freestyle

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
ID Management

  
Interest
Images & Movies

  
Interest
Import Export

  
Interest
Line Art

  
Interest
Masking

  
Interest
Metal

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Motion Tracking

  
Interest
Nodes & Physics

  
Interest
OpenGL

  
Interest
Overlay

  
Interest
Overrides

  
Interest
Performance

  
Interest
Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds & Tests

  
Interest
Python API

  
Interest
Render & Cycles

  
Interest
Render Pipeline

  
Interest
Sculpt, Paint & Texture

  
Interest
Text Editor

  
Interest
Translations

  
Interest
Triaging

  
Interest
Undo

  
Interest
USD

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Interest
Video Sequencer

  
Interest
Virtual Reality

  
Interest
Vulkan

  
Interest
Wayland
Issues relating to Wayland windowing support.

  
Interest
Workbench

  
Interest: X11

Issues relating to Xorg/X11 support.

  
Legacy
Blender 2.8 Project

  
Legacy
Milestone 1: Basic, Local Asset Browser

  
Legacy
OpenGL Error

  
Meta
Good First Issue

  
Meta
Papercut

  
Meta
Retrospective

  
Meta
Security
Issues relating to security: https://wiki.blender.org/wiki/Process/Vulnerability_Reports

  
Module
Animation & Rigging

  
Module
Core

  
Module
Development Management

  
Module
EEVEE & Viewport

  
Module
Grease Pencil

  
Module
Modeling

  
Module
Nodes & Physics

  
Module
Pipeline, Assets & IO

  
Module
Platforms, Builds & Tests

  
Module
Python API

  
Module
Render & Cycles

  
Module
Sculpt, Paint & Texture

  
Module
Triaging

  
Module
User Interface

  
Module
VFX & Video

  
Platform
FreeBSD

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Priority
High

  
Priority
Low

  
Priority
Normal

  
Priority
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

  
Type
Report

  
Type
To Do

No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser
Interest
Asset Browser Project Overview
Interest
Audio
Interest
Automated Testing
Interest
Blender Asset Bundle
Interest
BlendFile
Interest
Collada
Interest
Compatibility
Interest
Compositing
Interest
Core
Interest
Cycles
Interest
Dependency Graph
Interest
Development Management
Interest
EEVEE
Interest
EEVEE & Viewport
Interest
Freestyle
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
ID Management
Interest
Images & Movies
Interest
Import Export
Interest
Line Art
Interest
Masking
Interest
Metal
Interest
Modeling
Interest
Modifiers
Interest
Motion Tracking
Interest
Nodes & Physics
Interest
OpenGL
Interest
Overlay
Interest
Overrides
Interest
Performance
Interest
Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds & Tests
Interest
Python API
Interest
Render & Cycles
Interest
Render Pipeline
Interest
Sculpt, Paint & Texture
Interest
Text Editor
Interest
Translations
Interest
Triaging
Interest
Undo
Interest
USD
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Interest
Video Sequencer
Interest
Virtual Reality
Interest
Vulkan
Interest
Wayland
Interest
Workbench
Interest: X11
Legacy
Blender 2.8 Project
Legacy
Milestone 1: Basic, Local Asset Browser
Legacy
OpenGL Error
Meta
Good First Issue
Meta
Papercut
Meta
Retrospective
Meta
Security
Module
Animation & Rigging
Module
Core
Module
Development Management
Module
EEVEE & Viewport
Module
Grease Pencil
Module
Modeling
Module
Nodes & Physics
Module
Pipeline, Assets & IO
Module
Platforms, Builds & Tests
Module
Python API
Module
Render & Cycles
Module
Sculpt, Paint & Texture
Module
Triaging
Module
User Interface
Module
VFX & Video
Platform
FreeBSD
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
3.3 LTS
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
Philipp Oeser
23 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender#100749
No description provided.
Delete Branch "%!s(<nil>)"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?