diff options
Diffstat (limited to 'intern/opencolorio')
| -rw-r--r-- | intern/opencolorio/ocio_capi.h | 1 | ||||
| -rw-r--r-- | intern/opencolorio/ocio_impl.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/opencolorio/ocio_capi.h b/intern/opencolorio/ocio_capi.h index f4d7717ba46..9ba2d8fb8f9 100644 --- a/intern/opencolorio/ocio_capi.h +++ b/intern/opencolorio/ocio_capi.h @@ -31,6 +31,7 @@ struct OCIO_GLSLDrawState; int unused; \ } * name +#define OCIO_ROLE_DATA "data" #define OCIO_ROLE_SCENE_LINEAR "scene_linear" #define OCIO_ROLE_COLOR_PICKING "color_picking" #define OCIO_ROLE_TEXTURE_PAINT "texture_paint" diff --git a/intern/opencolorio/ocio_impl.cc b/intern/opencolorio/ocio_impl.cc index 644117e0000..25c1df70045 100644 --- a/intern/opencolorio/ocio_impl.cc +++ b/intern/opencolorio/ocio_impl.cc @@ -552,7 +552,7 @@ void OCIOImpl::colorSpaceIsBuiltin(OCIO_ConstConfigRcPtr *config_, processor = (*config)->getProcessor((*cs)->getName(), "scene_linear"); } catch (Exception &exception) { - OCIO_reportException(exception); + /* Silently ignore if no conversion possible, then it's not scene linear or sRGB. */ is_scene_linear = false; is_srgb = false; return; |