Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-11-14 12:12:53 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-11-14 12:12:53 +0400
commit97fe21410c350bc5e1aa4a7ebba78ef7a1e2b855 (patch)
tree677393f13ba1c73f00cb7a5d78f911d3c8398e2b /source/blender/imbuf/intern/colormanagement.c
parent7138beaa64941bd98a3d33f0d109bfb6fb216b99 (diff)
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..
Diffstat (limited to 'source/blender/imbuf/intern/colormanagement.c')
-rw-r--r--source/blender/imbuf/intern/colormanagement.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 3fd31f9a58c..1c68a466ade 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -2465,7 +2465,8 @@ ColormanageProcessor *IMB_colormanagement_display_processor_new(const ColorManag
}
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);