[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52203] trunk/blender/source/blender/imbuf /intern/colormanagement.c: Fix #33166: Wrong profile name in config. ocio causes crash

Sergey Sharybin sergey.vfx at gmail.com
Wed Nov 14 09:12:55 CET 2012


Revision: 52203
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52203
Author:   nazgul
Date:     2012-11-14 08:12:53 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Fix #33166: Wrong profile name in config.ocio causes crash

In this case we can not validate OCIO configuration and the only way
to fix such issues is to add NULL-pointer checks..

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-14 08:12:52 UTC (rev 52202)
+++ trunk/blender/source/blender/imbuf/intern/colormanagement.c	2012-11-14 08:12:53 UTC (rev 52203)
@@ -2465,7 +2465,8 @@
 	}
 
 	display_space =  display_transform_get_colorspace(applied_view_settings, display_settings);
-	cm_processor->is_data_result = display_space->is_data;
+	if (display_space)
+		cm_processor->is_data_result = display_space->is_data;
 
 	cm_processor->processor = create_display_buffer_processor(applied_view_settings->view_transform, display_settings->display_device,
 	                                                          applied_view_settings->exposure, applied_view_settings->gamma);




More information about the Bf-blender-cvs mailing list