Blender LTS: Maintenance Task
Confirmed, NormalPublicTO DO
Actions

Assigned To

Authored By

	Jeroen Bakker (jbakker)
	Jun 4 2020, 8:44 AM

Description

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 rB211b6c29f771: Remove trailing space
Last merge of blender-v2.83-release to master rB1438c1cfd55e: Merge branch 'blender-v2.83-release'
Last checked commit in master rB26cdab02a8ca: Cleanup: move tests into their corresponding namespace

To Be Backported

Report

Commits (master/other release branches)

Status

Commits in LTS

T75943

rBff97545c50f4: Fix T75943 EEVEE: Cubemaps shows black

New

T77455

rB202e7ccaaee8: Fix T77455: Blender Freezes when using the 3d Scale Gizmo

New

T78175

rB8c4703127ad1: GPU: Apple/Nvidia Proxy check

New

rBb5660f71fe77: Fix missing GPU image free in background mode

New

T77780

rB11a1ddfd3078: Fix T77780 Overlay: Weight colors are not in render in the right colorspace

New

T77984

rB792cb8bdc7f5: Fix T77984: Cycles OpenCL error rendering empty scene

New

T77655

rBe9d1d1f72580: Fix T77655 Overlay: Edit mode + wire drawtype + infront not transparent

New

T76229

rB8bee200e2f4b: Fix T76229 Overlay: Sulpt overlay not working if object use in-front option

New

T77641

rBaeb47920447d: Fix T77641 Sculpt mode performance regression in 2.83

New

rB2a72421cfb38: Fix error when filtering in Outliner "Blender File" mode with libraries

New

T78337

rBd7b10e5b740f: Fix T78337: Fix crash when use GPencil merge without materials

New

T76171

rB062a843bfbe7: EEVEE: Fix undefined behavior when using BSDF nodes inside volume shaders

New

T78134

rB9fbbd25e2a4c: Fix T78134: GPencil interpolation crash rBce7a5a23767c: Fix T78042: GPencil: Strokes go missing after Interpolation from another layer, rBa351eb072658: GPencil: Cleanup function names replace gp_ by gpencil_ prefix

New

T77759

P1491 Masterwork From Distant Lands

1	diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c
2	index 9d6105af8fb..7744f54cbd8 100644
3	--- a/source/blender/draw/engines/workbench/workbench_engine.c
4	+++ b/source/blender/draw/engines/workbench/workbench_engine.c
5	@@ -216,7 +216,11 @@ static void workbench_cache_hair_populate(WORKBENCH_PrivateData *wpd,
6	workbench_image_hair_setup(wpd, ob, matnr, ima, NULL, interp) :
7	workbench_material_hair_setup(wpd, ob, matnr, color_type);
8
9	- DRW_shgroup_hair_create_sub(ob, psys, md, grp);
10	+ grp = DRW_shgroup_hair_create_sub(ob, psys, md, grp);
11	+
12	+ if (use_texpaint_mode \|\| (color_type == V3D_SHADING_TEXTURE_COLOR)) {
13	+ workbench_image_hair_setup_post(wpd, ob, matnr, use_texpaint_mode, ima, NULL, interp, grp);
14	+ }
15	}
16
17	/**
18	diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c
19	index 0b7d313342b..00638aa9f61 100644
20	--- a/source/blender/draw/engines/workbench/workbench_materials.c
21	+++ b/source/blender/draw/engines/workbench/workbench_materials.c
22	@@ -283,14 +283,62 @@ DRWShadingGroup workbench_image_setup_ex(WORKBENCH_PrivateData wpd,
23	DRWShadingGroup *grp = (tex_tile_data) ? prepass->image_tiled_shgrp : prepass->image_shgrp;
24
25	*grp_tex = grp = DRW_shgroup_create_sub(grp);
26	- if (tex_tile_data) {
27	- DRW_shgroup_uniform_texture_persistent(grp, "imageTileArray", tex);
28	- DRW_shgroup_uniform_texture_persistent(grp, "imageTileData", tex_tile_data);
29	- }
30	- else {
31	- DRW_shgroup_uniform_texture_persistent(grp, "imageTexture", tex);
32	+ if (!hair) {
33	+ if (tex_tile_data) {
34	+ DRW_shgroup_uniform_texture(grp, "imageTileArray", tex);
35	+ DRW_shgroup_uniform_texture(grp, "imageTileData", tex_tile_data);
36	+ }
37	+ else {
38	+ DRW_shgroup_uniform_texture(grp, "imageTexture", tex);
39	+ }
40	}
41	DRW_shgroup_uniform_bool_copy(grp, "imagePremult", (ima && ima->alpha_mode == IMA_ALPHA_PREMUL));
42	DRW_shgroup_uniform_bool_copy(grp, "imageNearest", (interp == SHD_INTERP_CLOSEST));
43	return grp;
44	}
45	+
46	+/* Workaround for T77759 only present in LTS branch. */
47	+void workbench_image_hair_setup_post(WORKBENCH_PrivateData *wpd,
48	+ Object *ob,
49	+ int mat_nr,
50	+ const bool use_texpaint_mode,
51	+ Image *ima,
52	+ ImageUser *iuser,
53	+ int interp,
54	+ DRWShadingGroup *grp)
55	+{
56	+ GPUTexture tex = NULL, tex_tile_data = NULL;
57	+
58	+ if (!use_texpaint_mode) {
59	+ workbench_material_get_image(ob, mat_nr, &ima, &iuser, &interp);
60	+ if (ima == NULL) {
61	+ return;
62	+ }
63	+ }
64	+
65	+ if (ima == NULL) {
66	+ workbench_material_get_image(ob, mat_nr, &ima, &iuser, &interp);
67	+ }
68	+
69	+ if (ima) {
70	+ if (ima->source == IMA_SRC_TILED) {
71	+ tex = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_2D_ARRAY);
72	+ tex_tile_data = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_1D_ARRAY);
73	+ }
74	+ else {
75	+ tex = GPU_texture_from_blender(ima, iuser, NULL, GL_TEXTURE_2D);
76	+ }
77	+ }
78	+
79	+ if (tex == NULL) {
80	+ tex = wpd->dummy_image_tx;
81	+ }
82	+
83	+ if (tex_tile_data) {
84	+ DRW_shgroup_uniform_texture(grp, "imageTileArray", tex);
85	+ DRW_shgroup_uniform_texture(grp, "imageTileData", tex_tile_data);
86	+ }
87	+ else {
88	+ DRW_shgroup_uniform_texture(grp, "imageTexture", tex);
89	+ }
90	+}
91	\ No newline at end of file
92	diff --git a/source/blender/draw/engines/workbench/workbench_private.h b/source/blender/draw/engines/workbench/workbench_private.h
93	index 967bdf9bae0..204d2e995c0 100644
94	--- a/source/blender/draw/engines/workbench/workbench_private.h
95	+++ b/source/blender/draw/engines/workbench/workbench_private.h
96	@@ -464,6 +464,14 @@ DRWShadingGroup workbench_image_setup_ex(WORKBENCH_PrivateData wpd,
97	ImageUser *iuser,
98	int interp,
99	bool hair);
100	+void workbench_image_hair_setup_post(WORKBENCH_PrivateData *wpd,
101	+ Object *ob,
102	+ int mat_nr,
103	+ const bool use_texpaint_mode,
104	+ Image *ima,
105	+ ImageUser *iuser,
106	+ int interp,
107	+ DRWShadingGroup *grp);
108
109	#define workbench_material_setup(wpd, ob, mat_nr, color_type, r_transp) \
110	workbench_material_setup_ex(wpd, ob, mat_nr, color_type, false, r_transp)

New

T78045

rB51bf04383aa0: Fix T78045: CTL-ALT-S does nothing in pose mode and crashes when called from…, rBe54fb1b8191e: Cleanup: Move each recalcData to their respective TransData file, rB8522b429b568: Transform: Fixes after recent refactor

New

rBa809631ff262: VR: Fix too dark rendering on SteamVR

Wait for Fix

rBf12fe3c23eb4: VR: SteamVR is now a supported OpenXR runtime! (Windows only)

Wait for Fix

rBb468023aa1b5: VR: Properly support outputting sRGB swapchain buffers

Wait for Fix

Blender 2.83.2

Blender 2.83.1

Related Objects
Search...

Status	Subtype	Assigned	Task
Confirmed	TO DO	Jeroen Bakker (jbakker)	T77348 Blender LTS: Maintenance Task
Resolved	TO DO	Jeroen Bakker (jbakker)	T78245 Blender 2.83.1 Release Checklist
Confirmed	TO DO	None	T78523 Blender 2.83.2 Release Checklist