[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52055] trunk/blender/source/blender/imbuf /intern/colormanagement.c: fix for crashes running the BGE without colorspace enabled.

Campbell Barton ideasman42 at gmail.com
Sat Nov 10 00:59:18 CET 2012


Revision: 52055
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52055
Author:   campbellbarton
Date:     2012-11-09 23:59:16 +0000 (Fri, 09 Nov 2012)
Log Message:
-----------
fix for crashes running the BGE without colorspace enabled.

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	2012-11-09 23:54:58 UTC (rev 52054)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-11-09 23:59:16 UTC (rev 52055)
@@ -890,7 +890,7 @@
 {
 	ColorSpace *colorspace = colormanage_colorspace_get_named(from_colorspace);
 
-	if (colorspace->is_data) {
+	if (colorspace && colorspace->is_data) {
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 		return;
 	}
@@ -1083,7 +1083,7 @@
 {
 	ColorSpace *colorspace = colormanage_colorspace_get_named(name);
 
-	if (colorspace->is_data)
+	if (colorspace && colorspace->is_data)
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 	else
 		ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
@@ -1095,7 +1095,7 @@
 
 	ibuf->float_colorspace = colorspace;
 
-	if (colorspace->is_data)
+	if (colorspace && colorspace->is_data)
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 	else
 		ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
@@ -1107,7 +1107,7 @@
 
 	ibuf->rect_colorspace = colorspace;
 
-	if (colorspace->is_data)
+	if (colorspace && colorspace->is_data)
 		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
 	else
 		ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;




More information about the Bf-blender-cvs mailing list