Merging r58266 through r58279 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / blenkernel / intern / scene.c
index c08d3d5bf2023532510fed5285c4f7fbc4b50cf1..8df2160f021dccf2bdc563e32adcebdfdf39719b 100644 (file)
@@ -1683,6 +1683,16 @@ void BKE_scene_disable_color_management(Scene *scene)
 
 int BKE_scene_check_color_management_enabled(const Scene *scene)
 {
+       /* TODO(sergey): shouldn't be needed. but we're currently far to close to the release,
+        *               so better be extra-safe than sorry.
+        *
+        *               Will remove the check after the release.
+        */
+       if (!scene) {
+               BLI_assert(!"Shouldn't happen!");
+               return TRUE;
+       }
+
        return strcmp(scene->display_settings.display_device, "None") != 0;
 }