Cleanup: warning
authorCampbell Barton <ideasman42@gmail.com>
Tue, 7 Jun 2016 09:23:43 +0000 (19:23 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 7 Jun 2016 09:23:43 +0000 (19:23 +1000)
source/blender/blenkernel/intern/scene.c

index d16e6d5d17ac8881d9991466f7d516cd5ca630cb..a3393b6b9c0692ae56742b6762128a9a5c4bc99d 100644 (file)
@@ -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)