[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50664] trunk/blender: Color Management: fix crash when displaying render preview if OCIO was disabled buildtime

[Sergey Sharybin]

Revision: 50664
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50664
Author:   nazgul
Date:     2012-09-16 15:17:22 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
Color Management: fix crash when displaying render preview if OCIO was disabled buildtime

Modified Paths:
--------------
    trunk/blender/intern/opencolorio/ocio_capi.cpp
    trunk/blender/intern/opencolorio/ocio_capi.h
    trunk/blender/intern/opencolorio/ocio_capi_stub.cpp
    trunk/blender/source/blender/imbuf/intern/colormanagement.c

Modified: trunk/blender/intern/opencolorio/ocio_capi.cpp
===================================================================
--- trunk/blender/intern/opencolorio/ocio_capi.cpp	2012-09-16 14:43:44 UTC (rev 50663)
+++ trunk/blender/intern/opencolorio/ocio_capi.cpp	2012-09-16 15:17:22 UTC (rev 50664)
@@ -78,6 +78,11 @@
 	return NULL;
 }
 
+ConstConfigRcPtr *OCIO_getDefaultConfig(void)
+{
+	return NULL;
+}
+
 void OCIO_setCurrentConfig(const ConstConfigRcPtr *config)
 {
 	try {

Modified: trunk/blender/intern/opencolorio/ocio_capi.h
===================================================================
--- trunk/blender/intern/opencolorio/ocio_capi.h	2012-09-16 14:43:44 UTC (rev 50663)
+++ trunk/blender/intern/opencolorio/ocio_capi.h	2012-09-16 15:17:22 UTC (rev 50664)
@@ -59,6 +59,7 @@
 
 
 ConstConfigRcPtr *OCIO_getCurrentConfig(void);
+ConstConfigRcPtr *OCIO_getDefaultConfig(void);
 void OCIO_setCurrentConfig(const ConstConfigRcPtr *config);
 
 ConstConfigRcPtr *OCIO_configCreateFromEnv(void);

Modified: trunk/blender/intern/opencolorio/ocio_capi_stub.cpp
===================================================================
--- trunk/blender/intern/opencolorio/ocio_capi_stub.cpp	2012-09-16 14:43:44 UTC (rev 50663)
+++ trunk/blender/intern/opencolorio/ocio_capi_stub.cpp	2012-09-16 15:17:22 UTC (rev 50664)
@@ -56,6 +56,11 @@
 	return CONFIG_DEFAULT;
 }
 
+ConstConfigRcPtr *OCIO_getDefaultConfig(void)
+{
+	return CONFIG_DEFAULT;
+}
+
 void OCIO_setCurrentConfig(const ConstConfigRcPtr *)
 {
 }

Modified: trunk/blender/source/blender/imbuf/intern/colormanagement.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-09-16 14:43:44 UTC (rev 50663)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-09-16 15:17:22 UTC (rev 50664)
@@ -565,6 +565,10 @@
 		}
 	}
 
+	if (config == NULL) {
+		config = OCIO_getDefaultConfig();
+	}
+
 	if (config) {
 		OCIO_setCurrentConfig(config);