Blender LTS: Maintenance Task 2.83 #77348

Closed
opened 2020-06-04 08:44:04 +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.83 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 211b6c29f7
  • Last merge of blender-v2.83-release to master 1438c1c

To Be Backported

Report Commits in Master Remarks
#89542 77616082f4 does not apply, merge not obvious
#68290 405bff7fd8 678b76d99a should have backported b8b60e132d, too?
blender/blender-addons#81285 blender/blender-addons@0f6fa4644a

Blender 2.83.21

Report Commits in master Commits in LTS Remarks

Blender 2.83.20

Report Commits in master Commits in LTS Remarks
6a8ad00bcc 56958cd2e7
#95137 59b777eedd 4f16dad6b3
#95601 3a9a37d6dc ff05921099 Used P2796 instead
#95787 232d5d3f13 574f685855
02f4d63dcc 92d3a15239 Sanitize potentially corrupted shapekeys

Blender 2.83.19

Report Commits in master Commits in LTS Remarks
a64782b133 14b8f6c25b
#91879 c11585a82f b382632665
c6ba7359ae 90ee4b94ee
95c82513ca Related to 33c5e7bcd5 (forward compat crash fix)
#93194 b20997cb34 70395ff7fd
#88877 be0d5da341 ca881afef1
#93353 de7f1e8e07 cbc6c3938d
#93563 0f89d05848 4946f0c5a2
#93117 35c3644e78 5d1efa9759
#93130 a773cd3850 6786100313
#94799 ac3d07ad17 fcdaeba778
#93007 76105eb752 b82b608e91
#93320 1a7c32a0ab 944a705215
#93322 2cbb9d7a76 50733e1479
#89081 ef88047a97 9d519f1db4
#94422 4bf74afacc dd9f4e1b81
#94262 59221476b0 8b4d0d7338
#94544 f7018f7b06 22ce804c7d
#94564 13e7065dd2 b61a912128
#54488 5dedb39d44 a4171f4866
1152caad32 6570d5596b
#94629 82858ca3f4 63fdcbb588
#86952 bef2412ca2 0b2ea1d69b
#94661 d9dd8c287f 0ac83d05d7
0c94e5d166 f7b8875ed5
#94903 86b7746e3c 05ca297596
#94089 c0432d5edb 6ea0ecdc51
#94837 c8e536bac3 a6d70eecf4
#91062 blender/blender-addons@4e30cfd306 blender/blender-addons@770d08b7
blender/blender-addons#93209 blender/blender-addons@162cba016c blender/blender-addons@85dab78f
blender/blender-addons#77022 blender/blender-addons@fe12f8b975 blender/blender-addons@e37389de

Blender 2.83.18

Report Commits in master Commits in LTS
#90791 ce3a6d7989 a48df97ada 6be85c0eff e41a8d57d4
cb40c7ca1f e291f482ef
#90719 96d0cd57dc add1d601dc
#89241 f801d40daf 4f7dc4c918
#90493 4ca19c7153 bbfb29c794
be6409a748 6d1895c681
d8582d966f 120292a190
#89450 2b51124d6a a609e9f07f
#90417 26f1a5e2c8 607e3d3b88
#85436 f8abc3fb2f a70b625a10
#89835 03e2f11d48 bca66a2a71
834523e239 103e314be4
6c326ba0a2 dbdf22786d
#79775 b21db5e698 d3856b7e97
de60205f19 0367ce4b19
#90651 9564b6cf23 161e90f7ac
4e4ac5a867 06317ce957
079791dc30 5f156291cd
0e329a967e c6856da22c
#91557 f11bcb5a80 08fe34b7fd
a351023bd5 87237df4fd

Blender 2.83.17

Report Commits in master Commits in LTS
6c1fdd52c1 f6fb695ed8
#89247 e178a273fa 8dd18a77e7
#89405 2262d6c45a {ee0c3081b08ab2c97dd86215cb9e444d16c2e19a} c5c4727d6e
#89868 e82c5c6607 0de54a9cfe
38131cc5e5 1a1510a3a0
2e7e7a6fb6 b2f2daf21f
#81077 fc6a1f44d2 41d31be637
d6d44faff0 1f96166e08

Blender 2.83.16

Report Commits in master Commits in LTS
#88813 bfaf09b5bc {531e4fcf3ef}
#77651 6e56b42faa {a925c8969d7}
#88419 2e7d3ad7b5 704f56d68f
#88145 78316ac50e eee51b3cda
#88180 e76b43efcf b779fae993
5aee4ba143 1555809480
#88190 9801735b67 3f973791fb
#88227 12a91f7f5d d553edeb7d
c145cb7998 58e3d82108

Blender 2.83.15

Report Commits in master Commits in LTS
#88296

Blender 2.83.14

Report Commits in master Commits in LTS
#87055 72fec0f7c5 d35974cd87
#86170 a23e49c696 47cc05471d
0817763624 c5c35e9b47
#86765 dc1e98d8a0 42089fcde0
#87592 73af884df0 1e16662de8
#87863 d31d5523d5 0b61b75151
8c73f44a01 ec0a3ff456
e83a8e9083 9db56e4b7b

Blender 2.83.13

Report Commits in master Commits in LTS
#84988 e9cd3d50a7 2833f2b9bf
#79999 837b5743ce e954e565e1
3bb3b26 c661515090
60e5ebd 8d02177ab0
d64e171 f00ba34411
b4bddf2e3b
08aaa07 08aaa07adb
5105415 510541563e
052156a646

Blender 2.83.12

Report Commits in master Commits in LTS
#79356 55c56f1ffb 6265fe8605
927d099ec0 cde858ae98
#83280 561d9169fe 350d490a13
e035d7301c 7edf1e64b3
#83625 ffb6648a97 6c777ed76b
d11a87b88c 2f3e97b6d3
a3fcbb54f4 db7c7486fd
#82856 cb2517016b 4a61e9ea0f
#84459 4c44a5309c 89eda78d88
9fb32b2b29 fa54bf482c
c716b9862a b78d373e96
#84397 abbc43e4e4 f6c7da5759

Blender 2.83.11

NOTE: This version has been promoted to Blender 2.83.12 due to uploading issues in the Windows Store. We tried to use their test flight feature with a beta build and that blocked us from releasing Blender 2.83.11 final release. All packages must be uniquely identified by their full names.. Due to this we won't be integrating their test flight feature in our continuous integration pipeline.

Blender 2.83.10

Report Commits in master Commits in LTS
fb4113defb 4179be6499
c70650785b 22c0555cc5
#65585 b902edae75 19b85c5f4b
#82555 476a0d2311 8b59119e10
12168ccf18 13b02a724f
2e08500d04 d56111383a
#83055 841ae18605 50e8072708
#82729 4b248c1658 a08a08cb4c
#82988 436fd5663e c3c3807b05

Blender 2.83.9

Report Commits in master Commits in LTS
#81226 724a4f4676 ffb220590e
#81254 7c373555fd 6b1042f45a
#81688 5edba9b42f c7236ef4f1
#81520 1001adb500 0ff7d21c27
#81288 211d7ff3cf d5555115e1
#81854 90e12e823f 0845dc0eec
#81421 501854e4ee 8926b09fa9
edf4378c44 670ee877d9
#81942 3cc2dc40b3 c2535dff90
#81939 c53ac5e1c4 70d7863500
47a84bb338 05b4d8d13a
#71362 fa566157a5 7e39e0a9f6
#81633 adc0291061 89b5c9d433

Blender 2.83.8

Report Commits in master Commits in LTS
3dbb231ed2 094addfe84
#80905 a5dccd3320 7ac5695b29
#81168 0295e14f5f b72df3a4a4
e0f13f41c6 3bdf921e82
#61985 56748dbbcd 08b938a343
#80520 f5b6b82598 394a287714
#79973 a440060142 bfa485a26f
#80426 e43d482cc9 d745d0a7dc
#78653 fa81e36f65 63ed7c19d5
#62504 ca39325826 055c0f9077
#80630 7177a580cc 38d1bd9cc6
#80885 e6978f4d63 f7c5296f1d
#81218 d43e3f34d2 3f2b1f1b66
#81459 7d0139f417 dac242b993
ecdfb465cc 23bf3b09dd
#79356 782baa8f54 6c9c479048

Blender 2.83.7

Report Commits (master/other release branches) Commits in LTS
#71012 976b07056d 0016e73eda
#80238 c2419cdc5e 32057453ca
#80604 1f75be8a40 fe08aa4e2c
#80457 ec42daf630 bcacd98a6a
#78392 ec6d32b238 a4be38c065
#77584 1e186cea7c 46bdfcab10
#79737 4a82d792b0 3be5697b88
#80603 960a005bab 0f928c5841
#75061 6624c4c225 de0fc2a540

Blender 2.83.6

Report Commits (master/other release branches) Commits in LTS
#80530 1f58b0bbf7
f12fe3c23e 8cc52ef6e2
#78038 6ac235a6f7 {8a129041c50}
b468023aa1 {70637b303d9}
cb578ca104 {fe492d922d6}
b3c08a3a0a {3a5ef928961}
04f703fca6 {38ae2410200}
aba46371a1 {7369a24f61c}
074929d1c5 {0fb7d5381ef}
#79935 341ff17326 {22d8506ae57}
ebf10b72b0 {a994e7a4b9c}
#78186 e233ee1c1f {d80a95c2ee5}
#79111 cab9673bed {ec44ab0e893}
#77359 33ac3582bb {79945c8126c}
#80012 5f86a10477 {a9ae45597c3}
#79915 8bb93ca80a {676d995d296}
96401e2ef8 {19fe5529d73}
#80077 5eb7aa5ebb {dedab68dcce}
#80039 1bced5884c {dc61f7c1717}
4f6051e8c4 {42434d120ba}
#77683 e157573fab {1012569dfa3}
#78065 c5519d4b6f {421ce37f9c1}
#80135 1725e46cee {7071daaee3f}
#77754 8ffb006077 {74a9ffc8047}
#80078 df8a63bb9c {812c2343773}
#80104 ddbf41d88d {cbb5201f09b}
9b0ef34534 {521ae3d458a}
#77900 2ef5fabec9 {c4b9e2da8c3}
ddea2f234f {006ff645388}
#80159 2a0e996d77 {a9cacb22804}

Blender 2.83.5

Report Commits (master/other release branches) Commits in LTS
#79254 537c57136f ce44b1f15e
#79260 a8d058dbf4 287d5e8305
3886392430 b7a72778ec
#79187 9cbf43801b e48054ece4
#79158 b64ae920e4 2d3deb29ea
#79007 7aabd74222 f47f9a04b1
#78537 c7aa0f9d74 a71490c4b2
#78730 9cac158e96 4a08939e12
#79207 2bc017ece1 2c68c92524
4251a87bf6 ee43580623
#46568 732434cb1f 1d816e3a66
#78884 71683be4bb 39d7c111db
38e9a349de 0122615d36
#79509 cf3431e0e8 c15352dd67
#79246 00162e6b7b 02c3428e0c
#78529 6390b530d0 220470be15
fce71a255c 16b4b412e6
#79575 d4804f00fb 5c917ef032
a9e0aeaf65 6cbbe04ced
#79482 3f94f47113 f2b71df549
#77847 ab2dbafd8b 112416e4fb
#79324 9c093a5d9a fa2a13bcb9
#79676 aec0cfaf08 5d42024be6
#77885 8fbfc150a0 200de72d26
#79703 74556a5a17 04345dcf89

Blender 2.83.4

Report Commits (master/other release branches) Commits in LTS
#78999 f2907b06f4 {d5809b39d5b}
dcf7a05077 {573972ff41f}
#78867 6778ef4dcc {53b98de2603}
#79264 290b372aac {650cceb4538}
#79031 e296c9e24e {f1f8ac39211}
#79272 28b1c70895 {38aa78c6f46}
#77609 70a27d0a63, 7a0ad20e5f {9a4d51c5d98}, {46c3ef57156}
#77669 d33e715259 {322c67c9742}
#78837 75a09ba2ed {3058bf07577}
#78358 27783b4ac7 {c8d0a615efc}
#78920 065a00ee3e {3f23de9a3fc}
4a9d903e2b {bf92d262a3f}
#78636 75520894c7 {de3e797d47e}
#68845 5a11c8ba24 {5c806a2f044}
#78573 77f823a240 {0471349c90d}
#78037 16989c4d1d {833f67bf513}
#78306 960ce1e394 {a3db0850b4a}
#78308 1ae8855f8e {2472615d0ac}
#79180 b99358315e {1e53ca9b719}

Blender 2.83.3

Report Commits (master/other release branches) Status Commits in LTS
ffaf294c3f {icon circle color=red} Fix Applied 61ff27de15
#75943 ff97545c50 {icon circle color=red} Fix Applied 7505eafd27
#77455 202e7ccaae {icon circle color=red} Fix Applied cfc7c3ed12
#78175 8c4703127a {icon circle color=red} Fix Applied 82829aa79d
b5660f71fe {icon circle color=red} Fix Applied 6d88c9c1c1
#77780 11a1ddfd30 {icon circle color=green} Fix Applied 88260dd391
#77984 792cb8bdc7 {icon circle color=red} Fix Applied 3a2370bf23
#77655 e9d1d1f725 {icon circle color=green} Fix Applied a2d4b6c225
#76229 8bee200e2f {icon circle color=green} Fix Applied 0616a40bb2
#77641 aeb4792044 {icon circle color=red} Fix Applied 1ce42ffb7d
#74024 6d8b6aec18 {icon circle color=red} Fix Applied d81c45d809
2a72421cfb {icon circle color=red} Fix Applied 8808dfaa97
#78337 d7b10e5b74 {icon circle color=red} Fix Applied d29a749767, ea51c77025
#76171 062a843bfb {icon circle color=red} Fix Applied 631ef27725
#78134 9fbbd25e2a {icon circle color=red} Fix Applied c86094e3a4
#78042 ce7a5a2376 {icon circle color=red} Fix Applied e30db740db
#77759 P1491: Masterwork From Distant Lands
diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c
index 9d6105af8fb..7744f54cbd8 100644
--- a/source/blender/draw/engines/workbench/workbench_engine.c
+++ b/source/blender/draw/engines/workbench/workbench_engine.c
@@ -216,7 +216,11 @@ static void workbench_cache_hair_populate(WORKBENCH_PrivateData *wpd,
                              workbench_image_hair_setup(wpd, ob, matnr, ima, NULL, interp) :
                              workbench_material_hair_setup(wpd, ob, matnr, color_type);
 
-  DRW_shgroup_hair_create_sub(ob, psys, md, grp);
+  grp = DRW_shgroup_hair_create_sub(ob, psys, md, grp);
+
+  if (use_texpaint_mode || (color_type == V3D_SHADING_TEXTURE_COLOR)) {
+    workbench_image_hair_setup_post(wpd, ob, matnr, use_texpaint_mode, ima, NULL, interp, grp);
+  }
 }
 
 /**
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
index 0b7d313342b..00638aa9f61 100644
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@ -283,14 +283,62 @@ DRWShadingGroup *workbench_image_setup_ex(WORKBENCH_PrivateData *wpd,
   DRWShadingGroup *grp = (tex_tile_data) ? prepass->image_tiled_shgrp : prepass->image_shgrp;
 
   *grp_tex = grp = DRW_shgroup_create_sub(grp);
-  if (tex_tile_data) {
-    DRW_shgroup_uniform_texture_persistent(grp, "imageTileArray", tex);
-    DRW_shgroup_uniform_texture_persistent(grp, "imageTileData", tex_tile_data);
-  }
-  else {
-    DRW_shgroup_uniform_texture_persistent(grp, "imageTexture", tex);
+  if (!hair) {
+    if (tex_tile_data) {
+      DRW_shgroup_uniform_texture(grp, "imageTileArray", tex);
+      DRW_shgroup_uniform_texture(grp, "imageTileData", tex_tile_data);
+    }
+    else {
+      DRW_shgroup_uniform_texture(grp, "imageTexture", tex);
+    }
   }
   DRW_shgroup_uniform_bool_copy(grp, "imagePremult", (ima && ima->alpha_mode == IMA_ALPHA_PREMUL));
   DRW_shgroup_uniform_bool_copy(grp, "imageNearest", (interp == SHD_INTERP_CLOSEST));
   return grp;
 }
+
+/* Workaround for #77759 only present in LTS branch. */
+void workbench_image_hair_setup_post(WORKBENCH_PrivateData *wpd,
+                                     Object *ob,
+                                     int mat_nr,
+                                     const bool use_texpaint_mode,
+                                     Image *ima,
+                                     ImageUser *iuser,
+                                     int interp,
+                                     DRWShadingGroup *grp)
+{
+  GPUTexture *tex = NULL, *tex_tile_data = NULL;
+
+  if (!use_texpaint_mode) {
+    workbench_material_get_image(ob, mat_nr, &ima, &iuser, &interp);
+    if (ima == NULL) {
+      return;
+    }
+  }
+
+  if (ima == NULL) {
+    workbench_material_get_image(ob, mat_nr, &ima, &iuser, &interp);
+  }
+
+  if (ima) {
+    if (ima->source == IMA_SRC_TILED) {
+      tex = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_2D_ARRAY);
+      tex_tile_data = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_1D_ARRAY);
+    }
+    else {
+      tex = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_2D);
+    }
+  }
+
+  if (tex == NULL) {
+    tex = wpd->dummy_image_tx;
+  }
+
+  if (tex_tile_data) {
+    DRW_shgroup_uniform_texture(grp, "imageTileArray", tex);
+    DRW_shgroup_uniform_texture(grp, "imageTileData", tex_tile_data);
+  }
+  else {
+    DRW_shgroup_uniform_texture(grp, "imageTexture", tex);
+  }
+}
\ No newline at end of file
diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
index 967bdf9bae0..204d2e995c0 100644
--- a/source/blender/draw/engines/workbench/workbench_private.h
+++ b/source/blender/draw/engines/workbench/workbench_private.h
@@ -464,6 +464,14 @@ DRWShadingGroup *workbench_image_setup_ex(WORKBENCH_PrivateData *wpd,
                                           ImageUser *iuser,
                                           int interp,
                                           bool hair);
+void workbench_image_hair_setup_post(WORKBENCH_PrivateData *wpd,
+                                     Object *ob,
+                                     int mat_nr,
+                                     const bool use_texpaint_mode,
+                                     Image *ima,
+                                     ImageUser *iuser,
+                                     int interp,
+                                     DRWShadingGroup *grp);
 
 #define workbench_material_setup(wpd, ob, mat_nr, color_type, r_transp) \
   workbench_material_setup_ex(wpd, ob, mat_nr, color_type, false, r_transp)

                                  | {icon circle color=red} Fix Applied    | f5b77d660b |

Blender 2.83.2

Report Commits (master/other release branches) Status Commits in LTS
#77095 2d8c59ccb9 {icon circle color=red} Fix Applied 2822744b0b
#77734 e93663363e {icon circle color=red} Fix Applied 6e6954ac83
#66934 c26abd1c29 {icon circle color=red} Fix Applied 005c66395a
0ded6f5525 {icon circle color=red} Fix Applied ef0ded4df3
#77328 2d9ab46e0b {icon circle color=red} Fix Applied 910b421045
461ba2c74c {icon circle color=red} Fix Applied 2d89951be5
bfaa41c00d {icon circle color=red} Fix Applied 000fbef35d
#77754 25d2222c30 {icon circle color=red} Fix Applied a2c1f41d95
#77712 f345625ded {icon circle color=red} Fix Applied bb4f8b76ec
#77830 2dd60e6c2c {icon circle color=red} Fix Applied 089ff4a1dd
dd328be0f0 {icon circle color=red} Fix Applied 91b455c00f
#77913 756e664e4f {icon circle color=red} Fix Applied f7e73b5d45
#67358 16d09a5864 {icon circle color=green} Fix Applied 020b8e2c73
#78172 6f5a9dd8de {icon circle color=green} Fix Applied 3de9efdc9e
#77460 89bde99674, 4db63b6486, eaff606f2d {icon circle color=green} Fix Applied 517f32045c, 293b00beb5, f575a14801, 8289fc688b, b894480d68, 9171342185, e936269304

Blender 2.83.1

Report Commits (master/other release branches) Status Commits in LTS
#77774 df1ff76ee2 {icon circle color=green} Fix Applied 554ed613ae, 6e13cff487, 91f07fbfd6
#66786 fe3ca3f6ce {icon circle color=green} Fix Applied {68fae13d9b4}
#77803 e54058b121, 0aa7c11788 {icon circle color=green} Fix Applied {17ddb4c4ea0}, {e553408bee6}
16652185ce {icon circle color=green} Fix Applied {dceaef92d7a}
#77915 c880e54a95 25b8dedfb4 {icon circle color=green} Fix Applied {3bbcc4f6e8e},{465d5c018ee}
ffa23b6c77 {icon circle color=green} Fix Applied {58533aca4d6}
#75414 229ed078d1 {icon circle color=green} Fix Applied {5f01048dcb9}
#76767 e590526af6 {icon circle color=green} Fix Applied {945e18f0371}
#77853 eadbdf170a {icon circle color=green} Fix Applied {4f3fdf7715c}
#75898 3ced9c1c72, 2efe77ca51 {icon circle color=green} Fix Applied {e21a903b983a}, {783d3c675ac}
#77657 ed00b5def6 {icon circle color=green} Fix Applied {37a07d8a75d0f133e1d2458b698e82e3c53c3273}
874a078d86 {icon circle color=green} Fix Applied {8e555bf4e30bed9d276de32cd0ae369095146e54}
#77148 f88d59ecf8 {icon circle color=green} Fix Applied {0178e7b3939879323fefba798b7aff8ef1ea1cca}
#77047 20658e6a29 {icon circle color=green} Fix Applied {42a517779ab3d1f884195282744dd57444641a38}
#74101 4b39de677d {icon circle color=green} Fix Applied {60bf482dba721e3878770e6abefa3b35acca0021}
#77504 ee64b595da {icon circle color=green} Fix Applied {ce11640eef03736c1d840f8293bc890a1012de49}
#76894 4622434c34 {icon circle color=green} Fix Applied {c26cd6e996d751bb3011976f03e7ee8c508ac3c5}
#72936 c23b1de2cf {icon circle color=green} Fix Applied {0a8eeae831cbdd2ec80f3741e56bafe27ac6feaa}
#77504 7d2b4ae9c6 {icon circle color=green} Fix Applied {f649e5c418d931d750d9fbd45f63486ebc4be5e7}
#77603 b5846ebce7 {icon circle color=green} Fix Applied {5439f43e8830d9e0ac1cf8bb4434d37bb2eb062b}
bf4198cdaf {icon circle color=green} Fix Applied {5fc252feaeab0e86799c59eb328e64e71328b816}
ef0ff4aaf2 {icon circle color=green} Fix Applied {56b345adc6fd12954a9320c7ed76e30115a279ac}
00961d062a {icon circle color=green} Fix Applied {404c3adfcc768546381eb1efbbe4a9cf95847bb4}
D7772 4464a9425b {icon circle color=green} Fix Applied {9d5e5e282cff94325130dc43c1fb729d1340e492}
#76273 f71a2fc6c3 {icon circle color=green} Fix Applied {7b754c8c99526201ad4ed28ce6b216c9b8736c27}
#77358 c604d2762f {icon circle color=green} Fix Applied {1510c04d4173987c207ae246c164ef0f1bdc2de8}
#77520 dc6cee4724 {icon circle color=green} Fix Applied {2c3ef36a0b7fe301e32137a17635ceefaa1de791}
#77367 3da4724f72 {icon circle color=green} Fix Applied {488bf532076c4d620ad3e9c2f65952994851c483}
#77095 6899cb3c07 {icon circle color=green} Fix Applied {0148059c684e1325ab3210156d7fe6125cf27276}
#77164 733a3e3a70 {icon circle color=green} Fix Applied {0402cc7e9eb3916f7e212d546037b00abffeab4f}
#77156 4184371fb0 {icon circle color=green} Fix Applied {09db0f2a34671abc233681a5a14349642c7bd0dc}
studio/blender-studio#77456 aed11c673e {icon circle color=green} Fix Applied {e4ac4769f1cca1900f5dc626eb7eb312e1e93d3d}
#77448 3ffb52d114 {icon circle color=green} Fix Applied {864f8cbb860dc8b18971dcb9d240a5432994f0c8}
This task is a management task to track the commits and fixes that will be or are already applied to Blender 2.83 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 211b6c29f7 * Last merge of `blender-v2.83-release` to `master` 1438c1c ## To Be Backported | **Report** | **Commits in Master** | **Remarks** | | -- | -- | -- | | #89542 | 77616082f4 | does not apply, merge not obvious | | #68290 | 405bff7fd8 678b76d99a | should have backported b8b60e132d, too? | | blender/blender-addons#81285 | blender/blender-addons@0f6fa4644a | | ## Blender 2.83.21 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | ## Blender 2.83.20 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | 6a8ad00bcc | 56958cd2e7 | | | #95137 | 59b777eedd | 4f16dad6b3 | | | #95601 | 3a9a37d6dc | ff05921099 | Used [P2796](https://archive.blender.org/developer/P2796.txt) instead | | #95787 | 232d5d3f13 | 574f685855 | | | | 02f4d63dcc | 92d3a15239 | Sanitize potentially corrupted shapekeys | ## Blender 2.83.19 | **Report** | **Commits in master** | **Commits in LTS** | **Remarks** | | -- | -- | -- | -- | | | a64782b133 | 14b8f6c25b | | | #91879 | c11585a82f | b382632665 | | | | c6ba7359ae | 90ee4b94ee | | | | | 95c82513ca | Related to 33c5e7bcd5 (forward compat crash fix) | | #93194 | b20997cb34 | 70395ff7fd | | | #88877 | be0d5da341 | ca881afef1 | | | #93353 | de7f1e8e07 | cbc6c3938d | | | #93563 | 0f89d05848 | 4946f0c5a2 | | | #93117 | 35c3644e78 | 5d1efa9759 | | | #93130 | a773cd3850 | 6786100313 | | | #94799 | ac3d07ad17 | fcdaeba778 | | | #93007 | 76105eb752 | b82b608e91 | | | #93320 | 1a7c32a0ab | 944a705215 | | | #93322 | 2cbb9d7a76 | 50733e1479 | | | #89081 | ef88047a97 | 9d519f1db4 | | | #94422 | 4bf74afacc | dd9f4e1b81 | | | #94262 | 59221476b0 | 8b4d0d7338 | | | #94544 | f7018f7b06 | 22ce804c7d | | | #94564 | 13e7065dd2 | b61a912128 | | | #54488 | 5dedb39d44 | a4171f4866 | | | | 1152caad32 | 6570d5596b | | | #94629 | 82858ca3f4 | 63fdcbb588 | | | #86952 | bef2412ca2 | 0b2ea1d69b | | | #94661 | d9dd8c287f | 0ac83d05d7 | | | | 0c94e5d166 | f7b8875ed5 | | | #94903 | 86b7746e3c | 05ca297596 | | | #94089 | c0432d5edb | 6ea0ecdc51 | | | #94837 | c8e536bac3 | a6d70eecf4 | | | #91062 | blender/blender-addons@4e30cfd306 | blender/blender-addons@770d08b7 | | | blender/blender-addons#93209 | blender/blender-addons@162cba016c | blender/blender-addons@85dab78f | | | blender/blender-addons#77022 | blender/blender-addons@fe12f8b975 | blender/blender-addons@e37389de | | ## Blender 2.83.18 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #90791 | ce3a6d7989 a48df97ada | 6be85c0eff e41a8d57d4 | | | cb40c7ca1f | e291f482ef | |#90719|96d0cd57dc| add1d601dc | | #89241 | f801d40daf | 4f7dc4c918 | | #90493 | 4ca19c7153 | bbfb29c794 | | be6409a748 | 6d1895c681 | | | d8582d966f | 120292a190 | | #89450 | 2b51124d6a | a609e9f07f | | #90417 | 26f1a5e2c8 | 607e3d3b88 | |#85436| f8abc3fb2f | a70b625a10 | |#89835|03e2f11d48| bca66a2a71 | | | 834523e239 | 103e314be4 | | | 6c326ba0a2 | dbdf22786d | | #79775 | b21db5e698 | d3856b7e97 | | | de60205f19 | 0367ce4b19 | | #90651 | 9564b6cf23 | 161e90f7ac | | | 4e4ac5a867 | 06317ce957 | | | 079791dc30 | 5f156291cd | | | 0e329a967e | c6856da22c | | #91557 | f11bcb5a80 | 08fe34b7fd | | a351023bd5 | 87237df4fd | ## Blender 2.83.17 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | | 6c1fdd52c1 | f6fb695ed8 | | #89247 | e178a273fa | 8dd18a77e7 | | #89405 | 2262d6c45a {ee0c3081b08ab2c97dd86215cb9e444d16c2e19a} | c5c4727d6e | | #89868 | e82c5c6607 | 0de54a9cfe | | | 38131cc5e5 | 1a1510a3a0 | | | 2e7e7a6fb6 | b2f2daf21f | | #81077 | fc6a1f44d2 | 41d31be637 | | | d6d44faff0 | 1f96166e08 | ## Blender 2.83.16 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #88813 | bfaf09b5bc | {531e4fcf3ef} | | #77651 | 6e56b42faa | {a925c8969d7} | | #88419 | 2e7d3ad7b5 | 704f56d68f | | #88145 | 78316ac50e | eee51b3cda | | #88180 | e76b43efcf | b779fae993 | | | 5aee4ba143| 1555809480 | | #88190 | 9801735b67| 3f973791fb | | #88227 | 12a91f7f5d | d553edeb7d | | | c145cb7998 | 58e3d82108 | ## Blender 2.83.15 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #88296 | | | ## Blender 2.83.14 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #87055 | 72fec0f7c5 | d35974cd870b0caf5292f1188bef10881685c480 | | #86170 | a23e49c696 | 47cc05471d | | | 0817763624 | c5c35e9b47 | | #86765 | dc1e98d8a0 | 42089fcde0 | | #87592 | 73af884df0 | 1e16662de8 | | #87863 | d31d5523d5 | 0b61b75151 | | | 8c73f44a01 | ec0a3ff456 | | | e83a8e9083 | 9db56e4b7b | ## Blender 2.83.13 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #84988 | e9cd3d50a7 | 2833f2b9bf | #79999 | 837b5743ce | e954e565e1 | | | 3bb3b26 | c661515090 | | | 60e5ebd | 8d02177ab0 | | | d64e171 | f00ba34411 | | | | b4bddf2e3b | | | 08aaa07 | 08aaa07adb | | | 5105415 | 510541563e | | | 052156a646 | ## Blender 2.83.12 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #79356 | 55c56f1ffb | 6265fe8605 | | | 927d099ec0| cde858ae98 | | #83280 | 561d9169fe | 350d490a13 | | | e035d7301c | 7edf1e64b3 | | #83625 | ffb6648a97 | 6c777ed76b | | | d11a87b88c | 2f3e97b6d3 | | | a3fcbb54f4 | db7c7486fd | | #82856 | cb2517016b | 4a61e9ea0f | | #84459 | 4c44a5309c | 89eda78d88 | | | 9fb32b2b29 | fa54bf482c | | c716b9862a | b78d373e96 | | #84397| abbc43e4e4 | f6c7da5759 | ## Blender 2.83.11 NOTE: This version has been promoted to Blender 2.83.12 due to uploading issues in the Windows Store. We tried to use their test flight feature with a beta build and that blocked us from releasing Blender 2.83.11 final release. `All packages must be uniquely identified by their full names.`. Due to this we won't be integrating their test flight feature in our continuous integration pipeline. ## Blender 2.83.10 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | | fb4113defb | 4179be6499| | | c70650785b | 22c0555cc5 | | #65585 | b902edae75 | 19b85c5f4b | | #82555 | 476a0d2311 | 8b59119e10 | | | 12168ccf18 | 13b02a724f | | | 2e08500d04 | d56111383a | | #83055 | 841ae18605 | 50e8072708 | | #82729 | 4b248c1658 | a08a08cb4c | | #82988 | 436fd5663e | c3c3807b05 | ## Blender 2.83.9 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | #81226 | 724a4f4676 | ffb220590e | | #81254 | 7c373555fd | 6b1042f45a | | #81688 | 5edba9b42f | c7236ef4f1 | | #81520 | 1001adb500 | 0ff7d21c27 | | #81288 | 211d7ff3cf | d5555115e1 | | #81854 | 90e12e823f | 0845dc0eec | | #81421 | 501854e4ee | 8926b09fa9 | | | edf4378c44 | 670ee877d9 | | #81942 | 3cc2dc40b3 | c2535dff90 | | #81939 | c53ac5e1c4 | 70d7863500 | | | 47a84bb338 | 05b4d8d13a | | #71362 | fa566157a5 | 7e39e0a9f6 | | #81633 | adc0291061 | 89b5c9d433 | ## Blender 2.83.8 | **Report** | **Commits in master** | **Commits in LTS** | | -- | -- | -- | | | 3dbb231ed2 | 094addfe84 | | #80905 | a5dccd3320 | 7ac5695b29 | | #81168 | 0295e14f5f | b72df3a4a4 | | | e0f13f41c6 | 3bdf921e82 | | #61985 | 56748dbbcd | 08b938a343 | | #80520 | f5b6b82598 | 394a287714 | | #79973 | a440060142 | bfa485a26f | | #80426 | e43d482cc9 | d745d0a7dc | | #78653 | fa81e36f65 | 63ed7c19d5 | | #62504 | ca39325826 | 055c0f9077 | | #80630 | 7177a580cc | 38d1bd9cc6 | | #80885 | e6978f4d63 | f7c5296f1d | | #81218 | d43e3f34d2 | 3f2b1f1b667 | | #81459 | 7d0139f417 | dac242b993c | | | ecdfb465cc | 23bf3b09ddf | | #79356 | 782baa8f54 | 6c9c4790484 | ## Blender 2.83.7 | **Report** | **Commits** (master/other release branches) | **Commits in LTS** | | -- | -- | -- | | #71012 | 976b07056d | 0016e73eda9 | | #80238 | c2419cdc5e | 32057453caa | | #80604 | 1f75be8a40 | fe08aa4e2cb | | #80457 | ec42daf630 | bcacd98a6a9 | | #78392 | ec6d32b238 | a4be38c0650 | | #77584 | 1e186cea7c | 46bdfcab10f | | #79737 | 4a82d792b0 | 3be5697b889 | | #80603 | 960a005bab | 0f928c58416 | | #75061 | 6624c4c225 | de0fc2a540c | ## Blender 2.83.6 | **Report** | **Commits** (master/other release branches) | **Commits in LTS** | | -- | -- | -- | | #80530 | | 1f58b0bbf7 | | f12fe3c23e | 8cc52ef6e2 | | #78038 | 6ac235a6f7 | {8a129041c50} | | | b468023aa1 | {70637b303d9} | | | cb578ca104 | {fe492d922d6} | | | b3c08a3a0a | {3a5ef928961} | | | 04f703fca6 | {38ae2410200} | | | aba46371a1 | {7369a24f61c} | | | 074929d1c5 | {0fb7d5381ef} | | #79935 | 341ff17326 | {22d8506ae57} | | | ebf10b72b0 | {a994e7a4b9c} | | #78186 | e233ee1c1f | {d80a95c2ee5} | | #79111 | cab9673bed | {ec44ab0e893} | | #77359 | 33ac3582bb | {79945c8126c} | | #80012 | 5f86a10477 | {a9ae45597c3} | | #79915 | 8bb93ca80a | {676d995d296} | | | 96401e2ef8 | {19fe5529d73} | | #80077 | 5eb7aa5ebb | {dedab68dcce} | | #80039 | 1bced5884c | {dc61f7c1717} | | | 4f6051e8c4 | {42434d120ba} | | #77683| e157573fab | {1012569dfa3} | | #78065| c5519d4b6f | {421ce37f9c1} | | #80135 | 1725e46cee | {7071daaee3f} | | #77754 | 8ffb006077 | {74a9ffc8047} | |#80078 | df8a63bb9c | {812c2343773} | |#80104 | ddbf41d88d | {cbb5201f09b} | | | 9b0ef34534 | {521ae3d458a} | | #77900 | 2ef5fabec9 | {c4b9e2da8c3} | | | ddea2f234f | {006ff645388} | | #80159 | 2a0e996d77 | {a9cacb22804} | ## Blender 2.83.5 | **Report** | **Commits** (master/other release branches) | **Commits in LTS** | | -- | -- | -- | | #79254 | 537c57136f | ce44b1f15e | | #79260 | a8d058dbf4 | 287d5e8305 | | | 3886392430 | b7a72778ec | | #79187 | 9cbf43801b | e48054ece4 | | #79158 | b64ae920e4 | 2d3deb29ea | | #79007 | 7aabd74222 | f47f9a04b1 | | #78537 | c7aa0f9d74 | a71490c4b2 | | #78730 | 9cac158e96 | 4a08939e12 | | #79207 | 2bc017ece1 | 2c68c92524 | | | 4251a87bf6 | ee43580623 | | #46568 | 732434cb1f | 1d816e3a66 | | #78884 | 71683be4bb | 39d7c111db | | | 38e9a349de | 0122615d36 | | #79509 | cf3431e0e8 | c15352dd67 | | #79246 | 00162e6b7b | 02c3428e0c | | #78529 | 6390b530d0 | 220470be15 | | | fce71a255c | 16b4b412e6 | | #79575 | d4804f00fb | 5c917ef032 | | | a9e0aeaf65 | 6cbbe04ced | | #79482 | 3f94f47113 | f2b71df549 | | #77847 | ab2dbafd8b | 112416e4fb | | #79324 | 9c093a5d9a | fa2a13bcb9 | | #79676 | aec0cfaf08 | 5d42024be6 | | #77885 | 8fbfc150a0 | 200de72d26 | | #79703 | 74556a5a17 | 04345dcf89 | ## Blender 2.83.4 | **Report** | **Commits** (master/other release branches) | **Commits in LTS** | | -- | -- | -- | | #78999 | f2907b06f4 | {d5809b39d5b} | | | dcf7a05077 | {573972ff41f} | | #78867 | 6778ef4dcc | {53b98de2603} | | #79264 | 290b372aac | {650cceb4538} | | #79031 | e296c9e24e | {f1f8ac39211} | | #79272 | 28b1c70895 | {38aa78c6f46} | | #77609 | 70a27d0a63, 7a0ad20e5f | {9a4d51c5d98}, {46c3ef57156} | | #77669 | d33e715259 | {322c67c9742} | | #78837 | 75a09ba2ed | {3058bf07577} | | #78358 | 27783b4ac7 | {c8d0a615efc} | | #78920 | 065a00ee3e | {3f23de9a3fc} | | | 4a9d903e2b | {bf92d262a3f} | | #78636 | 75520894c7 | {de3e797d47e} | | #68845 | 5a11c8ba24 | {5c806a2f044} | | #78573 | 77f823a240 | {0471349c90d} | | #78037 | 16989c4d1d | {833f67bf513} | | #78306 | 960ce1e394 | {a3db0850b4a} | | #78308 | 1ae8855f8e | {2472615d0ac} | | #79180 | b99358315e | {1e53ca9b719} | ## Blender 2.83.3 | **Report** | **Commits** (master/other release branches) | **Status** | **Commits in LTS** | | -- | -- | -- | -- | | | ffaf294c3f | {icon circle color=red} Fix Applied | 61ff27de15 | | #75943 | ff97545c50 | {icon circle color=red} Fix Applied | 7505eafd27 | | #77455 | 202e7ccaae | {icon circle color=red} Fix Applied | cfc7c3ed12 | | #78175 | 8c4703127a | {icon circle color=red} Fix Applied | 82829aa79d | | | b5660f71fe | {icon circle color=red} Fix Applied | 6d88c9c1c1 | | #77780 | 11a1ddfd30 | {icon circle color=green} Fix Applied | 88260dd391 | | #77984 | 792cb8bdc7 | {icon circle color=red} Fix Applied | 3a2370bf23 | | #77655 | e9d1d1f725 | {icon circle color=green} Fix Applied | a2d4b6c225 | | #76229 | 8bee200e2f | {icon circle color=green} Fix Applied | 0616a40bb2 | | #77641 | aeb4792044 | {icon circle color=red} Fix Applied | 1ce42ffb7d | | #74024 | 6d8b6aec18 | {icon circle color=red} Fix Applied | d81c45d809 | | | 2a72421cfb | {icon circle color=red} Fix Applied | 8808dfaa97 | | #78337 | d7b10e5b74 | {icon circle color=red} Fix Applied | d29a749767, ea51c77025| | #76171 | 062a843bfb | {icon circle color=red} Fix Applied | 631ef27725 | #78134 | 9fbbd25e2a | {icon circle color=red} Fix Applied | c86094e3a4 | | #78042 | ce7a5a2376 | {icon circle color=red} Fix Applied | e30db740db | | #77759 | [P1491: Masterwork From Distant Lands](https://archive.blender.org/developer/P1491.txt) ``` diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index 9d6105af8fb..7744f54cbd8 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -216,7 +216,11 @@ static void workbench_cache_hair_populate(WORKBENCH_PrivateData *wpd, workbench_image_hair_setup(wpd, ob, matnr, ima, NULL, interp) : workbench_material_hair_setup(wpd, ob, matnr, color_type); - DRW_shgroup_hair_create_sub(ob, psys, md, grp); + grp = DRW_shgroup_hair_create_sub(ob, psys, md, grp); + + if (use_texpaint_mode || (color_type == V3D_SHADING_TEXTURE_COLOR)) { + workbench_image_hair_setup_post(wpd, ob, matnr, use_texpaint_mode, ima, NULL, interp, grp); + } } /** diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index 0b7d313342b..00638aa9f61 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -283,14 +283,62 @@ DRWShadingGroup *workbench_image_setup_ex(WORKBENCH_PrivateData *wpd, DRWShadingGroup *grp = (tex_tile_data) ? prepass->image_tiled_shgrp : prepass->image_shgrp; *grp_tex = grp = DRW_shgroup_create_sub(grp); - if (tex_tile_data) { - DRW_shgroup_uniform_texture_persistent(grp, "imageTileArray", tex); - DRW_shgroup_uniform_texture_persistent(grp, "imageTileData", tex_tile_data); - } - else { - DRW_shgroup_uniform_texture_persistent(grp, "imageTexture", tex); + if (!hair) { + if (tex_tile_data) { + DRW_shgroup_uniform_texture(grp, "imageTileArray", tex); + DRW_shgroup_uniform_texture(grp, "imageTileData", tex_tile_data); + } + else { + DRW_shgroup_uniform_texture(grp, "imageTexture", tex); + } } DRW_shgroup_uniform_bool_copy(grp, "imagePremult", (ima && ima->alpha_mode == IMA_ALPHA_PREMUL)); DRW_shgroup_uniform_bool_copy(grp, "imageNearest", (interp == SHD_INTERP_CLOSEST)); return grp; } + +/* Workaround for #77759 only present in LTS branch. */ +void workbench_image_hair_setup_post(WORKBENCH_PrivateData *wpd, + Object *ob, + int mat_nr, + const bool use_texpaint_mode, + Image *ima, + ImageUser *iuser, + int interp, + DRWShadingGroup *grp) +{ + GPUTexture *tex = NULL, *tex_tile_data = NULL; + + if (!use_texpaint_mode) { + workbench_material_get_image(ob, mat_nr, &ima, &iuser, &interp); + if (ima == NULL) { + return; + } + } + + if (ima == NULL) { + workbench_material_get_image(ob, mat_nr, &ima, &iuser, &interp); + } + + if (ima) { + if (ima->source == IMA_SRC_TILED) { + tex = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_2D_ARRAY); + tex_tile_data = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_1D_ARRAY); + } + else { + tex = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_2D); + } + } + + if (tex == NULL) { + tex = wpd->dummy_image_tx; + } + + if (tex_tile_data) { + DRW_shgroup_uniform_texture(grp, "imageTileArray", tex); + DRW_shgroup_uniform_texture(grp, "imageTileData", tex_tile_data); + } + else { + DRW_shgroup_uniform_texture(grp, "imageTexture", tex); + } +} \ No newline at end of file diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h index 967bdf9bae0..204d2e995c0 100644 --- a/source/blender/draw/engines/workbench/workbench_private.h +++ b/source/blender/draw/engines/workbench/workbench_private.h @@ -464,6 +464,14 @@ DRWShadingGroup *workbench_image_setup_ex(WORKBENCH_PrivateData *wpd, ImageUser *iuser, int interp, bool hair); +void workbench_image_hair_setup_post(WORKBENCH_PrivateData *wpd, + Object *ob, + int mat_nr, + const bool use_texpaint_mode, + Image *ima, + ImageUser *iuser, + int interp, + DRWShadingGroup *grp); #define workbench_material_setup(wpd, ob, mat_nr, color_type, r_transp) \ workbench_material_setup_ex(wpd, ob, mat_nr, color_type, false, r_transp) ``` | {icon circle color=red} Fix Applied | f5b77d660b | ## Blender 2.83.2 | **Report** | **Commits** (master/other release branches) | **Status** | **Commits in LTS** | | -- | -- | -- | -- | | #77095 | 2d8c59ccb9 | {icon circle color=red} Fix Applied | 2822744b0b | | #77734 | e93663363e | {icon circle color=red} Fix Applied | 6e6954ac83 | | #66934 | c26abd1c29 | {icon circle color=red} Fix Applied | 005c66395a | | | 0ded6f5525 | {icon circle color=red} Fix Applied | ef0ded4df3 | | #77328 | 2d9ab46e0b | {icon circle color=red} Fix Applied | 910b421045 | | | 461ba2c74c | {icon circle color=red} Fix Applied | 2d89951be5 | | | bfaa41c00d | {icon circle color=red} Fix Applied | 000fbef35d | | #77754 | 25d2222c30 | {icon circle color=red} Fix Applied | a2c1f41d95 | | #77712 | f345625ded | {icon circle color=red} Fix Applied | bb4f8b76ec | | #77830 | 2dd60e6c2c | {icon circle color=red} Fix Applied | 089ff4a1dd | | | dd328be0f0 | {icon circle color=red} Fix Applied | 91b455c00f | | #77913 | 756e664e4f | {icon circle color=red} Fix Applied | f7e73b5d45 | | #67358 | 16d09a5864 | {icon circle color=green} Fix Applied | 020b8e2c73 | | #78172 | 6f5a9dd8de | {icon circle color=green} Fix Applied | 3de9efdc9e | | #77460 | 89bde99674, 4db63b6486, eaff606f2d | {icon circle color=green} Fix Applied | 517f32045c, 293b00beb5, f575a14801, 8289fc688b, b894480d68, 9171342185, e936269304 | ## Blender 2.83.1 | **Report** | **Commits** (master/other release branches) | **Status** | **Commits in LTS** | | -- | -- | -- | -- | | #77774 | df1ff76ee2 | {icon circle color=green} Fix Applied | 554ed613ae, 6e13cff487, 91f07fbfd6 | | #66786 | fe3ca3f6ce | {icon circle color=green} Fix Applied | {68fae13d9b4} | | #77803 | e54058b121, 0aa7c11788 | {icon circle color=green} Fix Applied | {17ddb4c4ea0}, {e553408bee6} | | | 16652185ce | {icon circle color=green} Fix Applied | {dceaef92d7a} | | #77915 | c880e54a95 25b8dedfb4 | {icon circle color=green} Fix Applied | {3bbcc4f6e8e},{465d5c018ee} | | | ffa23b6c77 | {icon circle color=green} Fix Applied | {58533aca4d6} | | #75414 | 229ed078d1 | {icon circle color=green} Fix Applied | {5f01048dcb9} | | #76767 | e590526af6 | {icon circle color=green} Fix Applied | {945e18f0371} | | #77853 | eadbdf170a | {icon circle color=green} Fix Applied | {4f3fdf7715c} | | #75898 | 3ced9c1c72, 2efe77ca51 | {icon circle color=green} Fix Applied | {e21a903b983a}, {783d3c675ac} | | #77657 | ed00b5def6 | {icon circle color=green} Fix Applied | {37a07d8a75d0f133e1d2458b698e82e3c53c3273} | | | 874a078d86 | {icon circle color=green} Fix Applied | {8e555bf4e30bed9d276de32cd0ae369095146e54} | | #77148 | f88d59ecf8 | {icon circle color=green} Fix Applied | {0178e7b3939879323fefba798b7aff8ef1ea1cca} | | #77047 | 20658e6a29 | {icon circle color=green} Fix Applied | {42a517779ab3d1f884195282744dd57444641a38} | | #74101 | 4b39de677d | {icon circle color=green} Fix Applied | {60bf482dba721e3878770e6abefa3b35acca0021} | | #77504 | ee64b595da | {icon circle color=green} Fix Applied | {ce11640eef03736c1d840f8293bc890a1012de49} | | #76894 | 4622434c34 | {icon circle color=green} Fix Applied | {c26cd6e996d751bb3011976f03e7ee8c508ac3c5} | | #72936 | c23b1de2cf | {icon circle color=green} Fix Applied | {0a8eeae831cbdd2ec80f3741e56bafe27ac6feaa} | | #77504 | 7d2b4ae9c6 | {icon circle color=green} Fix Applied | {f649e5c418d931d750d9fbd45f63486ebc4be5e7} | | #77603 | b5846ebce7 | {icon circle color=green} Fix Applied | {5439f43e8830d9e0ac1cf8bb4434d37bb2eb062b} | | | bf4198cdaf | {icon circle color=green} Fix Applied | {5fc252feaeab0e86799c59eb328e64e71328b816} | | | ef0ff4aaf2 | {icon circle color=green} Fix Applied | {56b345adc6fd12954a9320c7ed76e30115a279ac} | | | 00961d062a | {icon circle color=green} Fix Applied | {404c3adfcc768546381eb1efbbe4a9cf95847bb4} | | [D7772](https://archive.blender.org/developer/D7772) | 4464a9425b | {icon circle color=green} Fix Applied | {9d5e5e282cff94325130dc43c1fb729d1340e492} | | #76273 | f71a2fc6c3 | {icon circle color=green} Fix Applied | {7b754c8c99526201ad4ed28ce6b216c9b8736c27} | | #77358 | c604d2762f | {icon circle color=green} Fix Applied | {1510c04d4173987c207ae246c164ef0f1bdc2de8} | | #77520 | dc6cee4724 | {icon circle color=green} Fix Applied | {2c3ef36a0b7fe301e32137a17635ceefaa1de791} | | #77367 | 3da4724f72 | {icon circle color=green} Fix Applied | {488bf532076c4d620ad3e9c2f65952994851c483} | | #77095 | 6899cb3c07 | {icon circle color=green} Fix Applied | {0148059c684e1325ab3210156d7fe6125cf27276} | | #77164 | 733a3e3a70 | {icon circle color=green} Fix Applied | {0402cc7e9eb3916f7e212d546037b00abffeab4f} | | #77156 | 4184371fb0 | {icon circle color=green} Fix Applied | {09db0f2a34671abc233681a5a14349642c7bd0dc} | | studio/blender-studio#77456 | aed11c673e | {icon circle color=green} Fix Applied | {e4ac4769f1cca1900f5dc626eb7eb312e1e93d3d} | | #77448 | 3ffb52d114 | {icon circle color=green} Fix Applied | {864f8cbb860dc8b18971dcb9d240a5432994f0c8} |
Jeroen Bakker self-assigned this 2020-06-04 08:44:04 +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

#77339 was marked as duplicate of this issue

#77339 was marked as duplicate of this issue
Jeroen Bakker changed title from Blender LTS: Support Task to Blender LTS: Maintenance Task 2020-06-04 11:38:45 +02:00

Added subscriber: @ChristopherAnderssarian

Added subscriber: @ChristopherAnderssarian

Added subscriber: @fsiddi

Added subscriber: @fsiddi

Added subscriber: @dark999

Added subscriber: @dark999

Added subscriber: @Harvester

Added subscriber: @Harvester

Added subscribers: @ZachHixson, @ideasman42

Added subscribers: @ZachHixson, @ideasman42

Added subscriber: @T.R.O.Nunes

Added subscriber: @T.R.O.Nunes

Added subscriber: @MichaelHermann

Added subscriber: @MichaelHermann

Added subscriber: @ompadu

Added subscriber: @ompadu

Added subscriber: @makoto3d

Added subscriber: @makoto3d

Added subscriber: @MeshVoid

Added subscriber: @MeshVoid

Added subscriber: @mont29

Added subscriber: @mont29

Added subscriber: @MACHIN3

Added subscriber: @MACHIN3
Member

Added subscriber: @Alaska

Added subscriber: @Alaska

Is 3ada1949f863 not going to be a part of 2.83.1 (or future bugfix releases)?

Is [3ada1949f863 ](https://developer.blender.org/rB3ada1949f8633293b4a424bf20789d94cf924c43) not going to be a part of 2.83.1 (or future bugfix releases)?

Removed subscriber: @MichaelHermann

Removed subscriber: @MichaelHermann

Removed subscriber: @makoto3d

Removed subscriber: @makoto3d

Added subscriber: @ReljaTrajkovic

Added subscriber: @ReljaTrajkovic

Added subscriber: @APEC

Added subscriber: @APEC

Hello,
Want to mention it here Individual Origins + Normal = Broken Again (works in 2.90, broken in 2.83 LTS)
I dont know what patch is fixes this in 2.9 and even how to find it...
maybe some one could help to find it, just want you to know about it.

Hello, Want to mention it here [Individual Origins + Normal = Broken Again (works in 2.90, broken in 2.83 LTS) ](https://developer.blender.org/T78424) I dont know what patch is fixes this in 2.9 and even how to find it... maybe some one could help to find it, just want you to know about it.

Added subscriber: @af_luther

Added subscriber: @af_luther

Removed subscriber: @APEC

Removed subscriber: @APEC

Added subscriber: @AditiaA.Pratama

Added subscriber: @AditiaA.Pratama

Removed subscriber: @af_luther

Removed subscriber: @af_luther

Removed subscriber: @ReljaTrajkovic

Removed subscriber: @ReljaTrajkovic

Added subscriber: @IAmActuallyCthulhu

Added subscriber: @IAmActuallyCthulhu

This issue was referenced by 6c9c479048

This issue was referenced by 6c9c47904841d729d27393851133dc2764184960

This issue was referenced by 782baa8f54

This issue was referenced by 782baa8f54bca659fdae60391147adbcad93d2bb

Added subscriber: @JerBot

Added subscriber: @JerBot

Removed subscriber: @ZachHixson

Removed subscriber: @ZachHixson

This issue was referenced by 1a375d6ece

This issue was referenced by 1a375d6eceed4c17f92fd90699645856e0951530

This issue was referenced by 02ff143f60

This issue was referenced by 02ff143f60977c2175b86fddb649a8c4c7787f84

This issue was referenced by 975ca91939

This issue was referenced by 975ca9193913c034f864121597e044d6eb043a5f
Jeroen Bakker changed title from Blender LTS: Maintenance Task to Blender LTS: Maintenance Task 2.83 2021-05-21 07:48:35 +02:00
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
Jeroen Bakker removed their assignment 2021-11-03 10:59:40 +01:00
Philipp Oeser was assigned by Jeroen Bakker 2021-11-03 10:59:40 +01:00

Removed subscriber: @MACHIN3

Removed subscriber: @MACHIN3

Added subscriber: @ThomasDinges

Added subscriber: @ThomasDinges

Changed status from 'Confirmed' to: 'Archived'

Changed status from 'Confirmed' to: 'Archived'

Closing this task, 2.83 isn't maintained anymore. https://code.blender.org/2022/06/blender-2-83-lts-2-years-later/

Closing this task, 2.83 isn't maintained anymore. https://code.blender.org/2022/06/blender-2-83-lts-2-years-later/
Thomas Dinges added this to the 2.83 LTS milestone 2023-02-08 16:35:42 +01:00
Sign in to join this conversation.
No Label
Interest
Alembic
Interest
Animation & Rigging
Interest
Asset Browser Project (Legacy)
Interest
Asset System
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
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#77348
No description provided.