Blender LTS: Maintenance Task 2.93 #88449

Closed
opened 2021-05-21 07:50:26 +02:00 by Jeroen Bakker · 40 comments
Member

This task is a management task to track the commits and fixes that will be or are already applied to Blender 2.93 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-v2.93-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 Master Remarks
#92423 8507336e76 needs fcc844f8fb [which causes issues] (also do 19a559d170 & ff2e8d6510)
#89204 bba6fe83e2 relies at least on 1d49293b80 [which caused issues]
#92962 c26011efcb skipped (no consensus if this is good for LTS)
#91160 325beef7af ED_time_scrub_draw_current_frame changed meanwhile, needs double-checking
#98225 14a893f20e has conflicts because of dfb193f634
#99705 b1329d7eaa Out of bounds buffer read could crash the thumbnailer with a maliciously formed .blend file , not sure this can be backported easily to 2.93 because of ef9269bd62
#93084 f20d0de3b7 conflicts because of 05a77bb0d8 needs double-checking
#101370 530b9841ee cant bake object transforms in 2.93
#101492 a01ab2b4e0 seems BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs changed, needs further investigation
#101903 {a450a2f2b2} build errors (missing BKE_layer_collection_resync_forbid)
ee56c46c15 redundant, "use_select_mouse" was introduced later
#103198 0beb358a69 conflicts because of f1c0249f34
#104514 dc9f7fe64f redundant? 556c71a84a is not in 2.93?
4ecbb3f1d5 If possible...
#88010 855d8d3fa4

Blender 2.93.18

Report Commits in master Commits in LTS Remarks
#107384 e96dbf13e8 fixed backport mistake in 3e3a70a8bb (from 671c3e1fa4)

Blender 2.93.17

Report Commits in master Commits in LTS Remarks
#106794 022652beb9 37bbeaa102

Blender 2.93.16

Report Commits in master Commits in LTS Remarks
#99836 b3f42d8e98 and related 6eb89d115f, a07534f71f, 0677fc3b08, ed9b5664e0, b693b89878 Use PR #105486.
#105160 d66672e17a 563e45e58f Used PR #105406
#104810 c624e56ffc 06c974bca6
218a909dec bb32f316f6 conflicts, used this Diff adapted

Blender 2.93.15

Report Commits in master Commits in LTS Remarks
#104176 9f866a92dc 0096682a50
#104243 a71ae981c7 9dc6bdf7a0
#90893 d335db09e0 d5bf817d9b
#88617 1a13940ef8 ab2a74274b
#104371 6d297c35c8 400f359144
7be7280c57 5d8fd91d79
16af35054d db00b50ac7
cca416cfe6 d730280c02

Blender 2.93.14

Report Commits in master Commits in LTS Remarks
#102993 e438e8e04e cdc10a9283
#103615 940fd87e77 bb194e6b84
blender/blender-addons#103455 blender/blender-addons@f131c922f9 blender/blender-addons@f2d0c03f

Blender 2.93.13

Report Commits in master Commits in LTS Remarks
#89515 c0fb8375f6 bf65f94f45

Blender 2.93.12

Report Commits in master Commits in LTS Remarks
#87039 7bcf21e66e 26e08cbeb8
#89199 1c0be7da4c dd444323f3
#89350 6c97c7f767 c184516c37
#101591 0484b6bb18 283af78657 build errors because of 83c274ccfc, resolved
#99997 ead3fc4a07 18f0caa6c1
#99603 fb424db2b7 398de297cf
#102014 671c3e1fa4 3e3a70a8bb had conflicts, resolved
#85870 82ba205646 0e1877b754
#102045 09faf8a449 4db3ae2c52
7c1ab77fa6 ac7b4855bd fixes build error with MSVC 17.4+
#102187 b927cc9ba6 6a9b0772fe
#100926 4401c93e45 34e9924086
#102514 63c4ec89e1 9e0fcd5755 conflicts (file moved to C++, resolved
5d481d9e55 9a537b63a5
#102685 179008f57a cdc73cb840 conflict (missing header), resolved
b0bcdcdbef 1f30e7c183 build errors (file was moved to C++), resolved

Blender 2.93.11

Report Commits in master Commits in LTS Remarks
#99979 c597d6cb64 6d24de6c43 patch applied, but one line off, corrected that
#100191 4dc9a8a21e 52a5c80313 conflict resolved
#100578 d269ad3535 fd248e6bf9 conflict resolved
#100851 6d0f8d5a19 8c148a4f3b
blender/blender-addons#93189 blender/blender-addons@94ebaf0492 blender/blender-addons@7685aa17
#99070 279e7dac7d 4b3b8156ee
#100606 62f764fad7 5c20363e37
#101138 7f284f5134 170e03aa98
#101034 f42569bb71 331fe92e46
#101046 c350d97a2f 3dce2469ee
#101109 eb54502d9d 1e7e1b151c
#101164 1cbfe04638 dfcc8086fb
blender/blender-addons#101239 blender/blender-addons@3e6a85eeca blender/blender-addons@f0dd4aaf

Blender 2.93.10

Report Commits in master Commits in LTS Remarks
32fd85e6f9 8f530d6a47 Extremely unlikely to happen in practice, but potential invalid memory accesses are always worth fixing. Had conflicts because of 6f305577b3 (solved)
#98699 f5dae5844c d57f57717a
blender/blender-addons#81285 blender/blender-addons@0f6fa4644a blender/blender-addons@9d801fca
106d937a4e d7901ed607
bb3a538843 41689bb310
3ae85a0d8f bc9d461ab0 Patch for 2.93 P3105
f3be8e66d7 ddffd1bc9f
d03a5fab7a
#99820 4d8018948d 977a5bbee1

Blender 2.93.9

Report Commits in master Commits in LTS Remarks
6a8ad00bcc df5da16aa1
#95137 59b777eedd 3cfccf1199
7df651367f 05f631b7ad
9d674d9852 87b77a97b9
#89542 77616082f4 1ee4e6bf31
#95601 3a9a37d6dc 3a9619af80 Used P2795 instead.
#95787 232d5d3f13 6d6bb04c19
02f4d63dcc fc56ef5f97 Sanitize potentially corrupted shapekeys
blender/blender-addons@e1d44bf375 blender/blender-addons@a99ece99
blender/blender-addons#90845 blender/blender-addons@e56895f5e4 blender/blender-addons@e7b71346
#96195 60481e4d99 fe6999352a
1c1efe3ac6 c3fed26f37
#96243 9097c97767 b6039cd82f
D14392 be3eef19c0 3dc36b32a1
#96624 913b6b9ec1 69cea4fce1
#96790 4039e94422 7dd15b7113
#68290 405bff7fd8 678b76d99a d0bcb6efea 49e1144832
#85756 ad245a25e2 f1173749c2
#97135 45f30543db 59e68d8031
#85467 883dbfb72f d2ca2c6e74

Blender 2.93.8

Report Commits in master Commits in LTS Remarks
deca1be480
2926f10ffe
#94109 9765ddf4eb 5c6418b077 used P2666
#91012 81514b0e91 42ab4b60bd
#94375 e505957b47 81879680e9
#94422 4bf74afacc dfdc7c3f81
#94262 59221476b0 20d0cddc60
#94544 f7018f7b06 9bae5988ba
#94366 5df916f23f 8a901d4925
#94564 13e7065dd2 3a79c1d8f5
#94685 08aa7861d6 a597164ea6
#94635 3ae664363d 9336edd060
#94137 f3c1d0e3a3 1f16b5d794
#54488 5dedb39d44 db9ddb8a45
1152caad32 e38a0eea5c
#94629 82858ca3f4 e07f16776b
#86952 bef2412ca2 d294d19d21
#94661 d9dd8c287f bbad834f1c
0c94e5d166 66346a6852
#93995 b32f5a922f 1c04d22ebf
#91005 c1f5d8d023 8e2ee4a3b7
#94768 f2fb9a0c59 8b749260fb also changed behavior, used P2726 only
#94799 ac3d07ad17 ccb2456df6
7a0cf2c72f caf362422e
#94903 86b7746e3c 4cd881c70f
#94089 c0432d5edb 49f25ae23c
#94837 c8e536bac3 fb21201d42
#94197 5d7ac749c5 3735e82c27

Blender 2.93.7

Report Commits in master Commits in LTS Remarks
#92090 1b2ee3c 0b89b94
1d8d6c2f62 Related to 33c5e7bcd5 (forward compat crash fix)
305b08b521 4796865b46
#92760 f81190f85f 89adf516cd
#93074 c3472cb11c 6cad8690c3
#93066 7d985d6b69 4a8f07a832
#88614 530f2994e9 bf8909eb5d
#92384 2eb94f3036 215a6f1c10
#89260 a5c59fb90e 419b4e0b00
#93194 b20997cb34 f043b0334b
#93198 7b09213f2f 9f73c9d656
#93007 76105eb752 63aa10802b
blender/blender-addons#81657 blender/blender-addons@4e30cfd306 blender/blender-addons@2fe7db71
blender/blender-addons#93209 blender/blender-addons@162cba016c blender/blender-addons@0521e90f
#93320 1a7c32a0ab 5121773cc5
#93322 2cbb9d7a76 647578b143
#93338 ffddf9e5c9 c2971eea84
#93117 35c3644e78 a29283f43a
#93130 a773cd3850 b02bdd52a4
#89081 ef88047a97 f3ba6ac182
#93290 12a83db83c 5e2dc507e7
blender/blender-addons@3c5d373fc4 blender/blender-addons@69c817b8 https://wiki.blender.org/wiki/Process/Addons
#89564 a0bb6bb4d6 654967b0e0
#93353 de7f1e8e07 ca6acceb60
#93563 0f89d05848 ef381ffd05
#92043 abab16f7c7 fb762eedbe
ee0000b8bb d23303e27d
blender/blender-addons#77022 blender/blender-addons@fe12f8b975 blender/blender-addons@cc971e50

Blender 2.93.6

Report Commits in master Commits in LTS
#87703 7124c66340 d56d5bfafc
#90840 46913bf0a0 379ffa75aa
#88386 215734bc52 6489f2212b
#91728 5bea5e2 5d8a7ba7de
a64782b133 aaa85ad2e0
#91237 008ae26712 53fd7abfe7
#89164 b80ed8396d 71f354a825
#84227 c8004ab407 ac42e58e31
#91879 c11585a82f 31dfdb6379
c6ba7359ae d3f0470289
#92185 51ea08487b dff17b0893
#91398 42d79a6041 71799d46b4
#88766 10abaf3ddf 272cb6157d
010e675b1b 554b1b1663
#92246 0071001879 5a5788ace2
#92314 3a25501143 2491bc5ec7
#92265 57f1379104 852d10bd3d
#90818 12c66854bd 7d2b6a213f
#91411 3c2e4f4cfd 28d581af92
#92355 10fb5cc58d 77104bf318
#88877 be0d5da341 8e237d83f2
#88449 d39cd851c0 f9f6d8de58
#92608 a5b996df88 619c51592f
37458798fa 9a290dd657
11be9edae2 9a80455d87
#89516 578ccdf75b 1180b4ff4a
#92515 8dbca01531 3bd6b80d65
#92807 00734d5724 fa99d3e53b

Blender 2.93.5

Report Commits in master Commits in LTS
#90651 9564b6cf23 52fdf42d35
#90772 5aa3167e48 1af6e0daaf
#90887 a112adf16a c6c9e361e2
#90887 a217e043be 1341664e48
#90752 d75e45d10c 74ba0f8bd8
de60205f19 515bdda3d9
4e4ac5a867 969d6d3a0f
2fb57685e3 933c6b7d8a
b39d66adde d6facd44b5
079791dc30 16637e7ff4
#88887 19d19970e4 ae7ec34dfe
#91060 af7233368d f0b3b6710c
#88433 b18122451f 333db02e5d
#91159 f530b43550 597d9518ef
blender/blender-addons#90600 blender/blender-addons@8750642fd5 blender/blender-addons@ce25c08d
#91401 56f8d7c705 e90aabdebf
0e329a967e ec448d5a6a
#91320 503d79cd77 cbf18b6586
#91448 1cd20b0026 8235d4dea6
#91511 1f51672d71 cc31c159a1
#91534 49ab38bf54 934c724755
#87801 84f98e28e3 f2e96c2473
#88754 4c156cba21 651f1b5cf9
#89045 8324ac8457 93c7e83b2a
#91607 6611f2cb74 25440e2a91
#91557 f11bcb5a80 5b588282a6
a351023bd5 4528c9a357
65739ded54 1ff10bb6d1
394a0b0da5 af42086e74

Blender 2.93.4

Report Commits in master Commits in LTS
08af3e6e92 85c08c9717
7aff40f410 7ec351c0d5
e314260fa7 9511009438
43ad345caa 54a821e8fd
a01cf90fd8 d486d24868
6df81ddb84 00dd68405d
ded68fb102 489df7ac88
2946f72a2a c634d859b2
#87967 118946d195 e97a2c228e
035d4c28ab 1a4122d441
#90719 96d0cd57dc f311542182
#90737 787350dde8 3fa1de6ad6
#89429 5d54f38949 ab572f3ac1
48c8f9fc9a 9fb9bf5996
45d100208e 70df9119f4
0b3c7544b5 9d94b358ca
9e2cd6b077 15a46a8b72 20f04ce62a
#90791 ce3a6d7989 a48df97ada 9eb62b99bc
#90690 ce64cfd6ed 2cbfa786f3
cb40c7ca1f e1e2abd4bf
#89241 f801d40daf 85b28933f0
#88033 cbc671947a 06ecdab9bc
#90493 4ca19c7153 7b1e8e244c
#89931 6fe00939b0 690fa2ba86
#90567 71d7505487 d97e586f58
#89101 ea3895558d 0cd6c1d502
#79775 b21db5e698 c2f74d6243
#89805 333c3c92ab 47618781d8
#88498 dc8844f8ef 60dbbaac42
#87681 3930b8c69e c2ba9be098
#90364 dbd34a5acb 06e3e2f21c

Blender 2.93.3

Report Commits in master Commits in LTS
#90477 3fab16fe8e ec00d218c9
be6409a748 4d7f10d614
d8582d966f e862874606
#89450 2b51124d6a f6665f506b
41357d556f a1b687c7a4
#90417 26f1a5e2c8 2bb38f3022
#85436 f8abc3fb2f 168965835c
#86030 00b57136e4 db5501eb6e
d5fd09ab58 2be2aeaf0a
3c50687073 bc627fbf65
d6d44faff0 a818ad5a54
675d8a9c43 69edb9c7d9
blender/blender-addons@437ce51ab7 blender/blender-addons@6a81558b
blender/blender-addons@7ce14793f9 blender/blender-addons@78a5ae9b
#89952 a70f37bd8a 443ae0f22d
#76356 26b2a35dd4 2ae04254b3
#83317 f9308a585e 4e14fe167d
#89416 03544ed54f 1fa73076ca
#78469 77187718e4 6e987ca32a
#87041 1062649b5e 2ccf4b15cc
#89835 03e2f11d48 45efd0b6a1
#83164 834523e239 6c326ba0a2 93aae90ab5 ee486aa5ce

Blender 2.93.2

Report Commits in master Commits in LTS
D11550 9e64fd461a
#89153 be451354c9) {2659bc54577}
#89571 P2225 back-ported (4546f176eb f578e31a8e) aa1bbadb5b
#89526 8f6a9c5176 cf9cacd091
98cd0fed36 27e3265267
#89265 071799d4fc 174f39bd03
6c1fdd52c1 32658bb5c9
#89247 e178a273fa 129798cacb
#89004 P2167 7573e45103
#88808 a6f275cad3 46daaec425
2ff490f9e3 3c6a981fd9
#89405 2262d6c45a {ee0c3081b08ab2c97dd86215cb9e444d16c2e19a} 2c7efe5ac0 3b7a520d88
8d6264ea12 f522e8db22
3311350670 fe4cbe62df
9225fe933a 14308b0a5e
ce649c7344 19c0666d40
a9dfde7b49 00ffe02820
1f55786791 13ab6b7bb6
14508ef100 7eb3e77b94
1949643ee5 02a6be5443
307f8c8e76 cea80f1add
1fb2eaf1c5 a68f5456e4
4adbe31e2f 7616f4ae57
c0367b19e2 444a8cbc2f
2e5671a959 bec8e436a1
#89422 c297769d22 e9d6f2164e d3f7ed08e7
#89868 e82c5c6607 d097d35be6
038345fa56 062764d5d0
38131cc5e5 41bd164e4c
2e7e7a6fb6 5d1ef0efd0
{620bb458da12ca863256af0cb238f0f934d9edcd} blender/blender-addons@0d880d12
{c84f83153900009f1c7743e3b21792ab1a730257} blender/blender-addons@526557bb
{c72e66249180b103165679834129574d5868fa68} blender/blender-addons@29db4b5f
{396c5b465776fefe32de53a57399d5adbb8db2c5} blender/blender-addons@ae7be84e
#89594 {834e87af7bbf719e18acd7ae8adc0d9403681a1b} cb1601dd
{8f5a4a2453887e37b51bb131176b0efbd0e9b42e} 7b94e7cca4
#89034 {53cf8e83b37da5cc4de2ef9bd6e4df9e81c976ac} 563fdaaa39
#89765 {c4f9bfcf5e7ddfaeacdea6dc9b01868edf74182f} 2d32bf14e4
#88015 {7b6c77aa84803e4268406e394aa4556ebf7980b0} b529a84ec3
#88756 5f9677fe0c d070cce778
#89455 2dbb492268 81e12cd9b1
#89838 2f280d4b92 25a1b27a93
#89851 5583d51773 3e6ea470ee
#89736 f709f12d93 283481643c
#89981 f164188a6d 00b135a379
#89982 3e29175af3 05ffe05ebc
#89733 574995478a 59b77cd688
blender/blender-addons#89724 blender/blender-addons@7884a7bbf9 blender/blender-addons@1868f2511c
blender/blender-addons#89812 blender/blender-addons@f418b29387 blender/blender-addons@40112c2d
#85517 {6abf63f463cf} 60a0928f35
#89884 97f1e47 fdb811f030

Blender 2.93.1

Report Commits in master Commits in LTS
#88899 98876d46ef {9d134104e47}
c145cb7998 {cc5392b4d93}
#88111 df32b50344 {8eef2f83e9a}
#88566 b813007a0f {b38eb310509}
#88531 03c0fa1cdb {c1d67abcd8f}
#88625 dfa3dcbab9 {dbb002387d1}
#88666 e0a1c3da46 {5a612097abb}
#88567 46447594de {0b577e977b4}
7654203cc8 {e1d2485fd32}
#88813 bfaf09b5bc {db909281f28}
#77651 6e56b42faa {706c7d775d2}
#88788 56005ef499 {d354e6a8468}
a496af8680 {57301121747}
#88464 0f156a2436 e24765d7d3
0a361eb5ec b4a81d8053
2053e1f533 {b61f4fd8da3}
952d6663e0 bc64801857
blender/documentation#89013 aa0bd29546 ba7f110753
#86956 a20ef4207d baa7a53974
This task is a management task to track the commits and fixes that will be or are already applied to Blender 2.93 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-v2.93-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 Master** | **Remarks** | | -- | -- | -- | |#92423| 8507336e76 | needs fcc844f8fb [which causes issues] (also do 19a559d170 & ff2e8d6510) | |#89204| bba6fe83e2 | relies at least on 1d49293b80 [which caused issues] | |#92962| c26011efcb | skipped (no consensus if this is good for LTS) | |#91160| 325beef7af | ED_time_scrub_draw_current_frame changed meanwhile, needs double-checking | | #98225 | 14a893f20e | has conflicts because of dfb193f634 | |#99705 | b1329d7eaa| Out of bounds buffer read could crash the thumbnailer with a maliciously formed .blend file , not sure this can be backported easily to 2.93 because of ef9269bd62| | #93084 | f20d0de3b7 | conflicts because of 05a77bb0d8 needs double-checking | | #101370 | 530b9841ee | cant bake object transforms in 2.93 | | #101492 | a01ab2b4e0 | seems BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs changed, needs further investigation | | ~~#101903~~ | ~~{a450a2f2b2}~~ | build errors (missing BKE_layer_collection_resync_forbid) | | | ee56c46c15 | redundant, "use_select_mouse" was introduced later | | #103198 | 0beb358a69 | conflicts because of f1c0249f34 | | #104514 | dc9f7fe64f14 | redundant? 556c71a84ac1 is not in 2.93?| | | 4ecbb3f1d5 | If possible... | | #88010 | 855d8d3fa4 | | ## Blender 2.93.18 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #107384 | | e96dbf13e8f509ea0bd303794a574979ce22d910 | fixed backport mistake in 3e3a70a8bb17 (from 671c3e1fa4ac) | ## Blender 2.93.17 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #106794 | 022652beb9bdf5040446da926313cb762cd8f61a | 37bbeaa10204c3d20cbebe89e13cddf55836c54a | | ## Blender 2.93.16 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #99836 | b3f42d8e98 and related | 6eb89d115f, a07534f71f, 0677fc3b08, ed9b5664e0, b693b89878 | Use PR #105486. | | #105160 | d66672e17a | 563e45e58f | Used PR #105406 | | #104810 | c624e56ffce681cdef142e8ace603684e9871663 | 06c974bca6b2c5411e7c791a7b91332683453e3d | | | | 218a909dec | bb32f316f6f590b2f02012ccf335983436191dc3 | conflicts, used [this Diff](https://projects.blender.org/blender/blender/issues/100749#issuecomment-883936) adapted | ## Blender 2.93.15 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #104176 | 9f866a92dc | 0096682a50f | | | #104243 | a71ae981c79a | 9dc6bdf7a0c | | | #90893 | d335db09e0 | d5bf817d9b8 | | | #88617 | 1a13940ef8 | ab2a74274b7 | | | #104371 | 6d297c35c8 | 400f3591442 | | | | 7be7280c57 | 5d8fd91d790 | | | | 16af35054d | db00b50ac70 | | | | cca416cfe6c2 | d730280c026 | | ## Blender 2.93.14 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #102993 | e438e8e04e | cdc10a9283 | | | #103615 | 940fd87e77 | bb194e6b84 | | | blender/blender-addons#103455 | blender/blender-addons@f131c922f9 | blender/blender-addons@f2d0c03f | | ## Blender 2.93.13 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #89515| c0fb8375f6 | bf65f94f45 | | ## Blender 2.93.12 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #87039 | 7bcf21e66e | 26e08cbeb8 | | | #89199 | 1c0be7da4c | dd444323f3 | | | #89350 | 6c97c7f767 | c184516c37 | | | #101591 | 0484b6bb18 | 283af78657 | build errors because of 83c274ccfc, resolved | | #99997 | ead3fc4a07 | 18f0caa6c1 | | | #99603 | fb424db2b7 | 398de297cf | | | #102014 | 671c3e1fa4 | 3e3a70a8bb | had conflicts, resolved | | #85870 | 82ba205646 | 0e1877b754 | | | #102045 | 09faf8a449 | 4db3ae2c52 | | | | 7c1ab77fa6 | ac7b4855bd | fixes build error with MSVC 17.4+ | | #102187 | b927cc9ba6 | 6a9b0772fe | | | #100926 | 4401c93e45 | 34e9924086 | | | #102514 | 63c4ec89e1 | 9e0fcd5755 | conflicts (file moved to C++, resolved | | | 5d481d9e55 | 9a537b63a5 | | | #102685 | 179008f57a | cdc73cb840 | conflict (missing header), resolved | | | b0bcdcdbef | 1f30e7c183 | build errors (file was moved to C++), resolved | ## Blender 2.93.11 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | #99979 | c597d6cb64| 6d24de6c43 | patch applied, but one line off, corrected that | | #100191| 4dc9a8a21e | 52a5c80313 | conflict resolved | | #100578 | d269ad3535 | fd248e6bf9 | conflict resolved | | #100851 | 6d0f8d5a19 | 8c148a4f3b | | | blender/blender-addons#93189 | blender/blender-addons@94ebaf0492 | blender/blender-addons@7685aa17 | | | #99070 | 279e7dac7d | 4b3b8156ee | | | #100606 | 62f764fad7 | 5c20363e37 | | | #101138 | 7f284f5134 | 170e03aa98 | | | #101034 | f42569bb71 | 331fe92e46 | | | #101046 | c350d97a2f | 3dce2469ee | | | #101109 | eb54502d9d | 1e7e1b151c | | | #101164 | 1cbfe04638 | dfcc8086fb | | | blender/blender-addons#101239 | blender/blender-addons@3e6a85eeca | blender/blender-addons@f0dd4aaf | | ## Blender 2.93.10 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | 32fd85e6f9 | 8f530d6a47 | Extremely unlikely to happen in practice, but potential invalid memory accesses are always worth fixing. Had conflicts because of 6f305577b3 (solved) | | #98699 | f5dae5844c | d57f57717a | | | blender/blender-addons#81285 | blender/blender-addons@0f6fa4644a | blender/blender-addons@9d801fca | | | | 106d937a4e | d7901ed607 | | | | bb3a538843 | 41689bb310 | | | | 3ae85a0d8f | bc9d461ab0 | Patch for 2.93 [P3105](https://archive.blender.org/developer/P3105.txt) | | | f3be8e66d7 | ddffd1bc9f | | | | | d03a5fab7a | | | #99820 | 4d8018948d | 977a5bbee1 | | ## Blender 2.93.9 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | 6a8ad00bcc | df5da16aa1 | | | #95137 | 59b777eedd | 3cfccf1199 | | | | 7df651367f | 05f631b7ad | | | | 9d674d9852 | 87b77a97b9 | | | #89542 | 77616082f4 | 1ee4e6bf31 | | | #95601 | 3a9a37d6dc | 3a9619af80 | Used [P2795](https://archive.blender.org/developer/P2795.txt) instead. | | #95787 | 232d5d3f13 | 6d6bb04c19 | | | | 02f4d63dcc | fc56ef5f97 | Sanitize potentially corrupted shapekeys | | | blender/blender-addons@e1d44bf375 | blender/blender-addons@a99ece99 | | | blender/blender-addons#90845 | blender/blender-addons@e56895f5e4 | blender/blender-addons@e7b71346 | | | #96195 | 60481e4d99 | fe6999352a | | | | 1c1efe3ac6 | c3fed26f37 | | | #96243 | 9097c97767 | b6039cd82f | | | [D14392](https://archive.blender.org/developer/D14392) | be3eef19c0 | 3dc36b32a1 | | | #96624 | 913b6b9ec1 | 69cea4fce1 | | | #96790 | 4039e94422 | 7dd15b7113 | | | #68290 | 405bff7fd8 678b76d99a | d0bcb6efea 49e1144832 | | | #85756 | ad245a25e2 | f1173749c2 | | | #97135 | 45f30543db | 59e68d8031 | | | #85467 | 883dbfb72f | d2ca2c6e74 | | ## Blender 2.93.8 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | | deca1be480 | | | | | 2926f10ffe | | |#94109| 9765ddf4eb | 5c6418b077 | used [P2666](https://archive.blender.org/developer/P2666.txt) | |#91012| 81514b0e91 | 42ab4b60bd | | |#94375| e505957b47 | 81879680e9 | | |#94422| 4bf74afacc | dfdc7c3f81 | | |#94262| 59221476b0 | 20d0cddc60 | | |#94544| f7018f7b06 | 9bae5988ba | | |#94366| 5df916f23f | 8a901d4925 | | |#94564| 13e7065dd2 | 3a79c1d8f5 | | |#94685| 08aa7861d6 | a597164ea6 | | |#94635| 3ae664363d | 9336edd060 | | |#94137| f3c1d0e3a3 | 1f16b5d794 | | |#54488| 5dedb39d44 | db9ddb8a45 | | | | 1152caad32 | e38a0eea5c | | |#94629| 82858ca3f4 | e07f16776b | | |#86952| bef2412ca2 | d294d19d21 | | |#94661| d9dd8c287f | bbad834f1c | | | | 0c94e5d166 | 66346a6852 | | |#93995| b32f5a922f | 1c04d22ebf | | |#91005| c1f5d8d023 | 8e2ee4a3b7 | | |#94768| f2fb9a0c59 | 8b749260fb | also changed behavior, used [P2726](https://archive.blender.org/developer/P2726.txt) only | |#94799| ac3d07ad17 | ccb2456df6 | | | | 7a0cf2c72f | caf362422e | | |#94903| 86b7746e3c | 4cd881c70f | | |#94089| c0432d5edb | 49f25ae23c | | |#94837| c8e536bac3 | fb21201d42 | | |#94197| 5d7ac749c5 | 3735e82c27 | | ## Blender 2.93.7 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | |#92090| 1b2ee3c | 0b89b94 | | | | | 1d8d6c2f62 | Related to 33c5e7bcd5 (forward compat crash fix) | | | 305b08b521 | 4796865b46 | | |#92760| f81190f85f | 89adf516cd | | |#93074| c3472cb11c | 6cad8690c3 | | |#93066| 7d985d6b69 | 4a8f07a832 | | |#88614| 530f2994e9 | bf8909eb5d | | |#92384| 2eb94f3036 | 215a6f1c10 | | |#89260| a5c59fb90e | 419b4e0b00 | | |#93194| b20997cb34 | f043b0334b | | |#93198| 7b09213f2f | 9f73c9d656 | | |#93007| 76105eb752 | 63aa10802b | | |blender/blender-addons#81657| blender/blender-addons@4e30cfd306 | blender/blender-addons@2fe7db71 | | |blender/blender-addons#93209| blender/blender-addons@162cba016c | blender/blender-addons@0521e90f | | |#93320| 1a7c32a0ab | 5121773cc5 | | |#93322| 2cbb9d7a76 | 647578b143 | | |#93338| ffddf9e5c9 | c2971eea84 | | |#93117| 35c3644e78 | a29283f43a | | |#93130| a773cd3850 | b02bdd52a4 | | |#89081| ef88047a97 | f3ba6ac182 | | |#93290| 12a83db83c | 5e2dc507e7 | | || blender/blender-addons@3c5d373fc4 | blender/blender-addons@69c817b8 | https://wiki.blender.org/wiki/Process/Addons | |#89564| a0bb6bb4d6 | 654967b0e0 | | |#93353| de7f1e8e07 | ca6acceb60 | | |#93563| 0f89d05848 | ef381ffd05 | | | #92043 | abab16f7c7 | fb762eedbe | | | | ee0000b8bb | d23303e27d | | | blender/blender-addons#77022 | blender/blender-addons@fe12f8b975 | blender/blender-addons@cc971e50 | | ## Blender 2.93.6 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #87703 | 7124c66340 | d56d5bfafc | | #90840 | 46913bf0a0 | 379ffa75aa | | #88386 | 215734bc52 | 6489f2212b | | #91728 | 5bea5e2 | 5d8a7ba7de | | |a64782b133 | aaa85ad2e0 | | #91237 | 008ae26712 | 53fd7abfe7 | | #89164 | b80ed8396d | 71f354a825 | | #84227 | c8004ab407 | ac42e58e31 | | #91879 | c11585a82f | 31dfdb6379 | | | c6ba7359ae | d3f0470289 | | #92185 | 51ea08487b | dff17b0893 | | #91398 | 42d79a6041 | 71799d46b4 | | #88766 | 10abaf3ddf | 272cb6157d | | | 010e675b1b | 554b1b1663 | | #92246 | 0071001879 | 5a5788ace2 | | #92314 | 3a25501143 | 2491bc5ec7 | | #92265 | 57f1379104 | 852d10bd3d | | #90818 | 12c66854bd | 7d2b6a213f | | #91411 | 3c2e4f4cfd | 28d581af92 | | #92355 | 10fb5cc58d | 77104bf318 | | #88877 | be0d5da341 | 8e237d83f2 | | #88449 | d39cd851c0 | f9f6d8de58 | | #92608 | a5b996df88 | 619c51592f | | | 37458798fa | 9a290dd657 | | | 11be9edae2 | 9a80455d87 | | #89516 | 578ccdf75b | 1180b4ff4a | | #92515 | 8dbca01531 | 3bd6b80d65 | | #92807 | 00734d5724 | fa99d3e53b | ## Blender 2.93.5 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #90651 | 9564b6cf23 | 52fdf42d35 | | #90772 | 5aa3167e48 | 1af6e0daaf | | #90887 | a112adf16a | c6c9e361e2 | | #90887 | a217e043be | 1341664e48 | | #90752 | d75e45d10c | 74ba0f8bd8 | | | de60205f19 | 515bdda3d9 | | | 4e4ac5a867 | 969d6d3a0f | | | 2fb57685e3 | 933c6b7d8a | | | b39d66adde | d6facd44b5 | | | 079791dc30 | 16637e7ff4 | | #88887 | 19d19970e4 | ae7ec34dfe | | #91060 | af7233368d | f0b3b6710c | | #88433 | b18122451f | 333db02e5d | | #91159 | f530b43550 | 597d9518ef | | blender/blender-addons#90600 | blender/blender-addons@8750642fd5 | blender/blender-addons@ce25c08d | | #91401 | 56f8d7c705 | e90aabdebf | | | 0e329a967e | ec448d5a6a | | #91320 | 503d79cd77 | cbf18b6586 | | #91448 | 1cd20b0026 | 8235d4dea6 | | #91511 | 1f51672d71 | cc31c159a1 | | #91534 | 49ab38bf54 | 934c724755 | | #87801 | 84f98e28e3 | f2e96c2473 | | #88754 | 4c156cba21 | 651f1b5cf9 | | #89045 | 8324ac8457 | 93c7e83b2a | | #91607 | 6611f2cb74 | 25440e2a91 | | #91557 | f11bcb5a80 | 5b588282a6 | | | a351023bd5 | 4528c9a357 | | | 65739ded54 | 1ff10bb6d1 | | | 394a0b0da5 | af42086e74 ## Blender 2.93.4 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | | 08af3e6e92 | 85c08c9717 | | | 7aff40f410 | 7ec351c0d5 | | |e314260fa7| 9511009438 | | |43ad345caa| 54a821e8fd | | |a01cf90fd8| d486d24868 | | |6df81ddb84| 00dd68405d | | |ded68fb102| 489df7ac88 | | |2946f72a2a| c634d859b2 | |#87967 |118946d195| e97a2c228e | | |035d4c28ab| 1a4122d441 | |#90719|96d0cd57dc| f311542182 | | #90737 | 787350dde8 | 3fa1de6ad6 | | #89429 | 5d54f38949 | ab572f3ac1 | | | 48c8f9fc9a | 9fb9bf5996 | | | 45d100208e | 70df9119f4 | | | 0b3c7544b5 | 9d94b358ca | | | 9e2cd6b077 15a46a8b72 | 20f04ce62a | | #90791 | ce3a6d7989 a48df97ada | 9eb62b99bc | | #90690 | ce64cfd6ed | 2cbfa786f3 | | | cb40c7ca1f | e1e2abd4bf | | #89241 | f801d40daf | 85b28933f0 | | #88033 | cbc671947a | 06ecdab9bc | | #90493 | 4ca19c7153 | 7b1e8e244c | | #89931 | 6fe00939b0 | 690fa2ba86 | | #90567 | 71d7505487 | d97e586f58 | | #89101 | ea3895558d | 0cd6c1d502 | | #79775 | b21db5e698 | c2f74d6243 | | #89805 | 333c3c92ab | 47618781d8 | | #88498 | dc8844f8ef | 60dbbaac42 | | #87681 | 3930b8c69e | c2ba9be098 | | #90364 | dbd34a5acb | 06e3e2f21c | ## Blender 2.93.3 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #90477 | 3fab16fe8e | ec00d218c9 | | | be6409a748 | 4d7f10d614 | | | d8582d966f | e862874606 | | #89450 | 2b51124d6a | f6665f506b | | | 41357d556f | a1b687c7a4 | | #90417 | 26f1a5e2c8 | 2bb38f3022 | |#85436| f8abc3fb2f | 168965835c | |#86030| 00b57136e4 | db5501eb6e | | | d5fd09ab58 | 2be2aeaf0a | | | 3c50687073 | bc627fbf65 | | | d6d44faff0 | a818ad5a54 | | | 675d8a9c43 | 69edb9c7d9 | | | blender/blender-addons@437ce51ab7 | blender/blender-addons@6a81558b | | | blender/blender-addons@7ce14793f9 | blender/blender-addons@78a5ae9b | | #89952 | a70f37bd8a | 443ae0f22d | | #76356 | 26b2a35dd4 | 2ae04254b3 | | #83317 | f9308a585e | 4e14fe167d | | #89416 | 03544ed54f | 1fa73076ca | | #78469 | 77187718e4 | 6e987ca32a | | #87041 | 1062649b5e | 2ccf4b15cc | | #89835 | 03e2f11d48| 45efd0b6a1 | | #83164 | 834523e239 6c326ba0a2| 93aae90ab5 ee486aa5ce| ## Blender 2.93.2 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | [D11550](https://archive.blender.org/developer/D11550) | | 9e64fd461a | |#89153| be451354c9) | {2659bc54577} | | #89571 | [P2225](https://archive.blender.org/developer/P2225.txt) back-ported (4546f176eb f578e31a8e) | aa1bbadb5b | | #89526 | 8f6a9c5176 | cf9cacd091 | | | 98cd0fed36 | 27e3265267 | | #89265 | 071799d4fc | 174f39bd03 | | | 6c1fdd52c1 | 32658bb5c9 | | #89247 | e178a273fa | 129798cacb | | #89004 | [P2167](https://archive.blender.org/developer/P2167.txt) | 7573e45103 | | #88808 | a6f275cad3 | 46daaec425 | | | 2ff490f9e3 | 3c6a981fd9 | | #89405 | 2262d6c45a {ee0c3081b08ab2c97dd86215cb9e444d16c2e19a} | 2c7efe5ac0 3b7a520d88 | | | 8d6264ea12 | f522e8db22 | | | 3311350670 | fe4cbe62df | | | 9225fe933a | 14308b0a5e | | | ce649c7344 | 19c0666d40 | | | a9dfde7b49 | 00ffe02820 | | | 1f55786791 | 13ab6b7bb6 | | | 14508ef100 | 7eb3e77b94 | | | 1949643ee5 | 02a6be5443 | | | 307f8c8e76 | cea80f1add | | | 1fb2eaf1c5 | a68f5456e4 | | | 4adbe31e2f | 7616f4ae57 | | | c0367b19e2 | 444a8cbc2f | | | 2e5671a959 | bec8e436a1 | | #89422 | c297769d22 | e9d6f2164e d3f7ed08e7 | | #89868 | e82c5c6607 | d097d35be6 | | | 038345fa56 | 062764d5d0 | | | 38131cc5e5 | 41bd164e4c | | | 2e7e7a6fb6 | 5d1ef0efd0 | | | {620bb458da12ca863256af0cb238f0f934d9edcd} | blender/blender-addons@0d880d12 | | | {c84f83153900009f1c7743e3b21792ab1a730257} | blender/blender-addons@526557bb | | | {c72e66249180b103165679834129574d5868fa68} | blender/blender-addons@29db4b5f | | | {396c5b465776fefe32de53a57399d5adbb8db2c5} |blender/blender-addons@ae7be84e | | #89594 | {834e87af7bbf719e18acd7ae8adc0d9403681a1b} | cb1601dd | | | {8f5a4a2453887e37b51bb131176b0efbd0e9b42e} | 7b94e7cca4 | | #89034 | {53cf8e83b37da5cc4de2ef9bd6e4df9e81c976ac} | 563fdaaa39 | | #89765 | {c4f9bfcf5e7ddfaeacdea6dc9b01868edf74182f} | 2d32bf14e4 | | #88015 | {7b6c77aa84803e4268406e394aa4556ebf7980b0} | b529a84ec3 | | #88756 | 5f9677fe0c | d070cce778 | | #89455 | 2dbb492268 | 81e12cd9b1 | | #89838 | 2f280d4b92 | 25a1b27a93 | | #89851 | 5583d51773 | 3e6ea470ee | | #89736 | f709f12d93 | 283481643c | | #89981 | f164188a6d | 00b135a379 | | #89982 | 3e29175af3 | 05ffe05ebc | | #89733 | 574995478a | 59b77cd688 | | blender/blender-addons#89724 | blender/blender-addons@7884a7bbf9 | blender/blender-addons@1868f2511c | | blender/blender-addons#89812 | blender/blender-addons@f418b29387 | blender/blender-addons@40112c2d | | #85517 | {6abf63f463cf} | 60a0928f35 | | #89884 | 97f1e47 | fdb811f030 | ## Blender 2.93.1 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #88899 | 98876d46ef | {9d134104e47}| | | c145cb7998 | {cc5392b4d93} | | #88111 | df32b50344 | {8eef2f83e9a} | | #88566 | b813007a0f | {b38eb310509} | | #88531 | 03c0fa1cdb | {c1d67abcd8f} | | #88625 | dfa3dcbab9 | {dbb002387d1} | | #88666 | e0a1c3da46 | {5a612097abb} | | #88567 | 46447594de| {0b577e977b4} | | | 7654203cc8 | {e1d2485fd32} | | #88813 | bfaf09b5bc | {db909281f28} | | #77651 | 6e56b42faa | {706c7d775d2} | | #88788 | 56005ef499 | {d354e6a8468} | | | a496af8680| {57301121747} | | #88464 | 0f156a2436 | e24765d7d3 | | | 0a361eb5ec | b4a81d8053 | | | 2053e1f533 | {b61f4fd8da3} | | | 952d6663e0 | bc64801857 | | blender/documentation#89013 | aa0bd29546 | ba7f110753 | | #86956 | a20ef4207d| baa7a53974
Jeroen Bakker self-assigned this 2021-05-21 07:50:26 +02:00
Author
Member

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

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

Added subscriber: @Jeroen-Bakker

Added subscriber: @Jeroen-Bakker
Member

Added subscriber: @lichtwerk

Added subscriber: @lichtwerk
Author
Member

Added subscriber: @ZedDB

Added subscriber: @ZedDB

@Jeroen-Bakker The VSE is in a bit of a volatile state right now, so I would put off any patches until we are sure that everything is working correctly in master.
However I would like us to backport as many things as possible as the VSE is in a very unreliable state in 2.93 (and master)

@Jeroen-Bakker The VSE is in a bit of a volatile state right now, so I would put off any patches until we are sure that everything is working correctly in master. However I would like us to backport as many things as possible as the VSE is in a very unreliable state in 2.93 (and master)

Just so we have it here as well:

I think we should probably merge the ffmpeg refactor and all seeking patches. Otherwise it could easily become a nightmare to backport fixes in these areas to this LTS release.
I don't think we should make it hard on the maintainers right out of the gate.

Just so we have it here as well: I think we should probably merge the ffmpeg refactor and all seeking patches. Otherwise it could easily become a nightmare to backport fixes in these areas to this LTS release. I don't think we should make it hard on the maintainers right out of the gate.
Author
Member

@ZedDB could help if you can find the commits. depending on how smooth it goes we might also consider a temp-branch.

@ZedDB could help if you can find the commits. depending on how smooth it goes we might also consider a temp-branch.

@Jeroen-Bakker These should be the commits:

Cleanup: Remove deprecated variables and functions calls from our ffmpeg code
8d6264ea12

Fix #87932: Failure to build movie strip proxy
3311350670

Make encoded video fps correct with ffmpeg < 4.4
9225fe933a

Fix #88623, #87044: Make encoded videos play correctly in VLC
ce649c7344

FFmpeg: Update proxy settings
a9dfde7b49

Fix #57397: Movies are blurred after sws_scale
1f55786791

FFmpeg: Fix seeking not returning the correct frame when not using TC index
14508ef100

Fix: Wrong logic for checking if we can reuse decoded frame
1949643ee5

Fix: Prevent small memory leak in VSE indexer
307f8c8e76

Fix: VSE timecodes being used even when turned off.
1fb2eaf1c5

Fix: VSE indexer seeking not working correctly
4adbe31e2f

Fix: VSE search in mpegts files would fail
c0367b19e2

Fix: VSE seeking with proxy strips would fail on certain frames
2e5671a959

@Jeroen-Bakker These should be the commits: Cleanup: Remove deprecated variables and functions calls from our ffmpeg code 8d6264ea12 Fix #87932: Failure to build movie strip proxy 3311350670 Make encoded video fps correct with ffmpeg < 4.4 9225fe933a Fix #88623, #87044: Make encoded videos play correctly in VLC ce649c7344 FFmpeg: Update proxy settings a9dfde7b49 Fix #57397: Movies are blurred after sws_scale 1f55786791 FFmpeg: Fix seeking not returning the correct frame when not using TC index 14508ef100 Fix: Wrong logic for checking if we can reuse decoded frame 1949643ee5 Fix: Prevent small memory leak in VSE indexer 307f8c8e76 Fix: VSE timecodes being used even when turned off. 1fb2eaf1c5 Fix: VSE indexer seeking not working correctly 4adbe31e2f Fix: VSE search in mpegts files would fail c0367b19e2 Fix: VSE seeking with proxy strips would fail on certain frames 2e5671a959
Member

Added subscriber: @filedescriptor

Added subscriber: @filedescriptor
Member

Added subscribers: @dfelinto, @ChengduLittleA

Added subscribers: @dfelinto, @ChengduLittleA
Member

Hi Jeroen (cc @dfelinto ) this #89422 needs to be in master as well as 2.93. Thanks!

Hi Jeroen (cc @dfelinto ) this #89422 needs to be in master as well as 2.93. Thanks!
Member

Hi Jereon ab6a011b3b needs to be in 2.93 Thanks!

Hi Jereon ab6a011b3bd21ff12bf66bb5cf4c2a0c6617f86c needs to be in 2.93 Thanks!
Member

Added subscriber: @PratikPB2123

Added subscriber: @PratikPB2123

Added subscriber: @APEC

Added subscriber: @APEC
Add this pls to 2.93.5 https://developer.blender.org/rBA8750642fd56d7fec26b5b1280deabe1393314600

Removed subscriber: @APEC

Removed subscriber: @APEC
Member

Added subscriber: @Alaska

Added subscriber: @Alaska
Member

I'm not sure whether or not you consider this important enough to backport: 1bdaf0ebec

I'm not sure whether or not you consider this important enough to backport: 1bdaf0ebec

Added subscriber: @brecht

Added subscriber: @brecht

In #88449#1224995, @Alaska wrote:
I'm not sure whether or not you consider this important enough to backport: 1bdaf0ebec

I would not backport this unless we get a request for it from someone who really needs this, it's a relatively risky change for a feature few people use.

> In #88449#1224995, @Alaska wrote: > I'm not sure whether or not you consider this important enough to backport: 1bdaf0ebec I would not backport this unless we get a request for it from someone who really needs this, it's a relatively risky change for a feature few people use.
Jeroen Bakker was unassigned by Philipp Oeser 2021-11-02 10:02:52 +01:00
Philipp Oeser self-assigned this 2021-11-02 10:02:52 +01:00

Added subscriber: @TinyNick

Added subscriber: @TinyNick
Member

Added subscriber: @iss

Added subscriber: @iss
Member

Added subscriber: @ideasman42

Added subscriber: @ideasman42

Removed subscriber: @TinyNick

Removed subscriber: @TinyNick

Added subscriber: @Harvester

Added subscriber: @Harvester
Philipp Oeser removed their assignment 2022-12-19 09:52:34 +01:00
Member

Stepping down since I wont be handling LTS anymore in the forseeable future.

Stepping down since I wont be handling LTS anymore in the forseeable future.
Thomas Dinges added this to the 2.93 LTS milestone 2023-02-07 18:40:57 +01:00
Bastien Montagne added reference blender-v2.93-release 2023-02-09 15:22:46 +01:00
Philipp Oeser self-assigned this 2023-02-11 09:47:04 +01:00
Member

test comment mentioning cca416cfe6

test comment mentioning cca416cfe6c2
Member

test comment mentioning 16af35054d

test comment mentioning 16af35054dc75fbfaf4bfc365d7223d8fdb23f01
Member

@Sergey , @brecht backporting cca416cfe6 seems to need all of 16af35054d, abc040f26c, 7be7280c57 as well?

@Sergey , @brecht backporting cca416cfe6c2 seems to need all of 16af35054d, abc040f26cb1, 7be7280c5710 as well?
Member

@antoniov backporting 218a909dec give conflicts (which I'd prefer you look into -- can you provide a patch for 2.93?)

@antoniov backporting 218a909dec give conflicts (which I'd prefer you look into -- can you provide a patch for 2.93?)

@lichtwerk from the edit history it seems you put cca416cfe6 on the list, by accident? I'm not expecting that to be backported to 2.93.

It's not here:
https://archive.blender.org/developer/T88449

@lichtwerk from the edit history it seems you put cca416cfe6 on the list, by accident? I'm not expecting that to be backported to 2.93. It's not here: https://archive.blender.org/developer/T88449
Member

@lichtwerk from the edit history it seems you put cca416cfe6 on the list, by accident? I'm not expecting that to be backported to 2.93.

It's not here:
https://archive.blender.org/developer/T88449

@brecht : this was requested by Brian Savery AMD ( @bsavery not here? ) per mail (which went to @Jeroen-Bakker first), but we can remove the commit from the list and I'll inform him.

bonus: I asked @Sergey prior, see https://blender.chat/group/blender-release?msg=R5vAyR5z2xQtgDMqQ

> @lichtwerk from the edit history it seems you put cca416cfe6 on the list, by accident? I'm not expecting that to be backported to 2.93. > > It's not here: > https://archive.blender.org/developer/T88449 @brecht : this was requested by Brian Savery AMD ( @bsavery not here? ) per mail (which went to @Jeroen-Bakker first), but we can remove the commit from the list and I'll inform him. bonus: I asked @Sergey prior, see https://blender.chat/group/blender-release?msg=R5vAyR5z2xQtgDMqQ

@lichtwerk It appears so. Seems to require a good round of testing after that though :)

@brecht AFAIK some big LTS users prefer to compile the Blender from sources and do not rely on the official builds. So I think it is good to reduce the hoops one needs to go through to get things compiled.

@lichtwerk It appears so. Seems to require a good round of testing after that though :) @brecht AFAIK some big LTS users prefer to compile the Blender from sources and do not rely on the official builds. So I think it is good to reduce the hoops one needs to go through to get things compiled.

I'm fine with this getting backported and all those commits seem ok, I just was missing context.

I'm fine with this getting backported and all those commits seem ok, I just was missing context.
Member

@filedescriptor , @antoniov : dc9f7fe64f seems redundant? 556c71a84a is not in 2.93?

@filedescriptor , @antoniov : dc9f7fe64f seems redundant? 556c71a84a is not in 2.93?
Member

I believe there was a "Merge down" option in 2.93. And if I'm not going crazy I tested it too.

I believe there was a "Merge down" option in 2.93. And if I'm not going crazy I tested it too.
Member

I'm fine with this getting backported and all those commits seem ok, I just was missing context.

Added three of the four now (abc040f26c was actually not needed, my bad)

> I'm fine with this getting backported and all those commits seem ok, I just was missing context. Added three of the four now (abc040f26c was actually **not** needed, my bad)
Member

I believe there was a "Merge down" option in 2.93. And if I'm not going crazy I tested it too.

Well, at least dc9f7fe64f is dependent on 556c71a84a (gives conflicts cherry-picking because of that). Mind checking?

> I believe there was a "Merge down" option in 2.93. And if I'm not going crazy I tested it too. Well, at least dc9f7fe64f is dependent on 556c71a84a (gives conflicts cherry-picking because of that). Mind checking?

@filedescriptor Could you try to do a pr for 2.93 for the commit 218a909dec ?

I have tried several times, but all the times I get an error in CMake and I'm unable to get the code working in Visual Studio. It looks 2.93 was not compatible with my setup.

The fix is very simple and the patch only needs to be updated to use .c instead of .cc file

@filedescriptor Could you try to do a pr for 2.93 for the commit 218a909dec ? I have tried several times, but all the times I get an error in CMake and I'm unable to get the code working in Visual Studio. It looks 2.93 was not compatible with my setup. The fix is very simple and the patch only needs to be updated to use .c instead of .cc file
Member

I think we can now close this? :)

I think we can now close this? :)
Pratik Borhade added
Status
Resolved
and removed
Status
Confirmed
labels 2023-07-31 13:56:11 +02:00
Blender Bot added
Status
Archived
and removed
Status
Resolved
labels 2023-07-31 13:56:19 +02:00
Sign in to join this conversation.
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
No Milestone
No project
No Assignees
13 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#88449
No description provided.