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:
Clément Foucault 2020-04-19 21:07:59 +02:00
parent 5cc7e2ae16 2816b22b38
commit c1c97c3d4a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/draw/engines/workbench/workbench_data.c
View File

@ -199,7 +199,6 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
}
wpd->clip_state = clip_state;
wpd->cull_state = CULL_BACKFACE_ENABLED(v3d) ? DRW_STATE_CULL_BACK : 0;
wpd->vldata = vldata;
wpd->world_ubo = vldata->world_ubo;
@ -266,6 +265,8 @@ void workbench_private_data_init(WORKBENCH_PrivateData *wpd)
copy_v4_fl(wpd->background_color, 0.0f);
}
wpd->cull_state = CULL_BACKFACE_ENABLED(wpd) ? DRW_STATE_CULL_BACK : 0;
if (wpd->shading.light == V3D_LIGHTING_MATCAP) {
wpd->studio_light = BKE_studiolight_find(wpd->shading.matcap, STUDIOLIGHT_TYPE_MATCAP);
}