[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50826] trunk/blender/source/blender/imbuf /intern/colormanagement.c: fix for crash loading old files without colormanagement.

Campbell Barton ideasman42 at gmail.com
Sun Sep 23 12:30:40 CEST 2012


Revision: 50826
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50826
Author:   campbellbarton
Date:     2012-09-23 10:30:39 +0000 (Sun, 23 Sep 2012)
Log Message:
-----------
fix for crash loading old files without colormanagement.

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-09-23 10:25:22 UTC (rev 50825)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-09-23 10:30:39 UTC (rev 50826)
@@ -1042,12 +1042,14 @@
 void IMB_colormanagement_assign_rect_colorspace(ImBuf *ibuf, const char *name)
 {
 	ColorSpace *colorspace = colormanage_colorspace_get_named(name);
-	ibuf->rect_colorspace = colorspace;
+	if (colorspace) {
+		ibuf->rect_colorspace = colorspace;
 
-	if (colorspace->is_data)
-		ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
-	else
-		ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
+		if (colorspace->is_data)
+			ibuf->colormanage_flag |= IMB_COLORMANAGE_IS_DATA;
+		else
+			ibuf->colormanage_flag &= ~IMB_COLORMANAGE_IS_DATA;
+	}
 }
 
 /*********************** Threaded display buffer transform routines *************************/




More information about the Bf-blender-cvs mailing list