[Bf-blender-cvs] [f1e51c14e8a] vr_scene_inspection: Fix scene lighting and shadow options having no effect

[Julian Eisel]

Commit: f1e51c14e8aaeb37f17bbeafbaa9c3983c399460
Author: Julian Eisel
Date:   Thu Feb 20 13:13:32 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rBf1e51c14e8aaeb37f17bbeafbaa9c3983c399460

Fix scene lighting and shadow options having no effect

===================================================================

M       source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c 
b/source/blender/editors/space_view3d/view3d_draw.c
index 921725a9004..289eb0cf9b3 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1739,7 +1739,10 @@ void ED_view3d_draw_offscreen_simple(Depsgraph 
*depsgraph,
   memcpy(&v3d.shading, source_shading_settings, sizeof(View3DShading));
   v3d.shading.type = drawtype;
 
-  if (drawtype == OB_MATERIAL) {
+  if (shading_override) {
+    /* Pass. */
+  }
+  else if (drawtype == OB_MATERIAL) {
     v3d.shading.flag = V3D_SHADING_SCENE_WORLD | V3D_SHADING_SCENE_LIGHTS;
   }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs