[Bf-blender-cvs] [e2ae104] compositor-2016: Cleanup: warning

[Campbell Barton]

Commit: e2ae104372d781e0b0351e9e48c08e7f754aca93
Author: Campbell Barton
Date:   Tue Jun 7 19:23:43 2016 +1000
Branches: compositor-2016
https://developer.blender.org/rBe2ae104372d781e0b0351e9e48c08e7f754aca93

Cleanup: warning

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

M	source/blender/blenkernel/intern/scene.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index d16e6d5..a3393b6 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)