[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60034] trunk/blender/source/blender/imbuf /intern/colormanagement.c: Fix #36698 Cycles MinGW64 Mike Pan scene crashes instantly.

[Lukas Toenne]

Revision: 60034
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60034
Author:   lukastoenne
Date:     2013-09-11 07:07:16 +0000 (Wed, 11 Sep 2013)
Log Message:
-----------
Fix #36698 Cycles MinGW64 Mike Pan scene crashes instantly. Missing pointer check in color management look access from r59945. The look_desc pointer is NULL if the look string is undefined (empty).

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59945

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/intern/colormanagement.c

Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-09-11 06:56:51 UTC (rev 60033)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2013-09-11 07:07:16 UTC (rev 60034)
@@ -750,7 +750,7 @@
 	OCIO_displayTransformSetView(dt, view_transform);
 	OCIO_displayTransformSetDisplay(dt, display);
 
-	if (look_descr->is_noop == false) {
+	if (look_descr && look_descr->is_noop == false) {
 		OCIO_displayTransformSetLooksOverrideEnabled(dt, true);
 		OCIO_displayTransformSetLooksOverride(dt, look);
 	}