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>2016-12-06 16:19:17 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-12-06 16:19:17 +0300
commit1b9cae9d04c222d1ce8dc05abbd5692c30fe3e57 (patch)
treef261a4ac2e217d40f51d4b87b374377c84e6db07
parent1de79c896019c7fa20dee9dabb25a331463767d2 (diff)
Fix T50122: SEGFAULT: OCIO configuration typo leads to segfault
-rw-r--r--source/blender/imbuf/intern/colormanagement.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c
index 01348549bc4..a45346279d9 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -1227,7 +1227,12 @@ const char *IMB_colormanagement_get_float_colorspace(ImBuf *ibuf)
const char *IMB_colormanagement_get_rect_colorspace(ImBuf *ibuf)
{
- return ibuf->rect_colorspace->name;
+ if (ibuf->rect_colorspace) {
+ return ibuf->rect_colorspace->name;
+ }
+ else {
+ return IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DEFAULT_BYTE);
+ }
}
/*********************** Threaded display buffer transform routines *************************/