diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-02 21:28:29 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-04-02 21:28:29 +0400 |
| commit | f871d9a82f06e70fb26cbe0bfbd4db18d481059c (patch) | |
| tree | aa8c565e9e046041d06809bc6afcb7fb49e503b1 /source/blender/imbuf/intern/colormanagement.c | |
| parent | 726dedafbc6d9b4a12ccf1a715f16459d7e7b1ef (diff) | |
Fixes for recent GLSL display space conversions
- Building without OCIO will give correct results again
- If GLSL failed to compile, fallback to glaDrawPixelsAuto
will happen.
Diffstat (limited to 'source/blender/imbuf/intern/colormanagement.c')
| -rw-r--r-- | source/blender/imbuf/intern/colormanagement.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/colormanagement.c b/source/blender/imbuf/intern/colormanagement.c index 95f67b9b21d..e9447d255cb 100644 --- a/source/blender/imbuf/intern/colormanagement.c +++ b/source/blender/imbuf/intern/colormanagement.c @@ -2775,9 +2775,7 @@ int IMB_coloemanagement_setup_glsl_draw(const ColorManagedViewSettings *view_set /* Make sure OCIO processor is up-to-date. */ update_glsl_display_processor(applied_view_settings, display_settings); - OCIO_setupGLSLDraw(&global_glsl_state.ocio_glsl_state, global_glsl_state.processor); - - return TRUE; + return OCIO_setupGLSLDraw(&global_glsl_state.ocio_glsl_state, global_glsl_state.processor); } int IMB_coloemanagement_setup_glsl_draw_from_ctx(const bContext *C) |