diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-06-07 12:23:43 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2016-06-08 22:45:40 +0300 |
| commit | e2ae104372d781e0b0351e9e48c08e7f754aca93 (patch) | |
| tree | 7cd5dd5365452e4c90860bb9689a43f3a6df1aa3 | |
| parent | 80efb183cce9b41667738f5c09cc93a2710cadcb (diff) | |
Cleanup: warning
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 3 |
1 files changed, 2 insertions, 1 deletions
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) |