From 0036ffb3e608afb9f24374c7942cbdd5efc5dd68 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Jun 2016 19:23:43 +1000 Subject: Cleanup: warning --- source/blender/blenkernel/intern/scene.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index d16e6d5d17a..a3393b6b9c0 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -2196,7 +2196,8 @@ bool BKE_scene_use_shading_nodes_custom(Scene *scene) bool BKE_scene_use_world_space_shading(Scene *scene) { const RenderEngineType *type = RE_engines_find(scene->r.engine); - return (type && (type->flag & RE_USE_SHADING_NODES) || (scene->r.mode & R_USE_WS_SHADING)); + return ((scene->r.mode & R_USE_WS_SHADING) || + (type && (type->flag & RE_USE_SHADING_NODES))); } bool BKE_scene_use_spherical_stereo(Scene *scene) -- cgit v1.2.3