blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.83-release'

This commit is contained in:
Robert Guetzkow 2020-04-22 19:20:11 +02:00
parent f5b540593c 0dfe30502a
commit 22cf2572d9
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/locale

@ -1 +1 @@
Subproject commit c68481a509eaf79ce61a4391ec1e11a7760d5457
Subproject commit 80f390fd0e20d7e2aadf07c43a45717e810fa10d

2
release/scripts/addons

@ -1 +1 @@
Subproject commit f12430cae606db8aeeb72f99fe15ebbd71d4a92c
Subproject commit 44c17b01168ea180d7ea865e9ec1ef6e93097b3a

2
source/blender/draw/engines/workbench/workbench_opaque.c
View File

@ -92,10 +92,12 @@ void workbench_opaque_cache_init(WORKBENCH_Data *data)
wpd->prepass[opaque][infront][hair].common_shgrp = grp = DRW_shgroup_create(sh, pass);
DRW_shgroup_uniform_block(grp, "material_block", wpd->material_ubo_curr);
DRW_shgroup_uniform_int_copy(grp, "materialIndex", -1);
DRW_shgroup_uniform_bool_copy(grp, "useMatcap", use_matcap);
wpd->prepass[opaque][infront][hair].vcol_shgrp = grp = DRW_shgroup_create(sh, pass);
DRW_shgroup_uniform_block_persistent(grp, "material_block", wpd->material_ubo_curr);
DRW_shgroup_uniform_int_copy(grp, "materialIndex", 0); /* Default material. (uses vcol) */
DRW_shgroup_uniform_bool_copy(grp, "useMatcap", use_matcap);
sh = workbench_shader_opaque_image_get(wpd, hair, false);

2
source/tools

@ -1 +1 @@
Subproject commit 8a36c2833db48ed78c436ee19534ce5cf3b2eeee
Subproject commit 35dd27ded664b1068e773c27988ee221f3ce39d9