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 /intern/opencolorio/ocio_capi.cc | |
| 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 'intern/opencolorio/ocio_capi.cc')
| -rw-r--r-- | intern/opencolorio/ocio_capi.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/opencolorio/ocio_capi.cc b/intern/opencolorio/ocio_capi.cc index 73d8af295f2..8e831bb0736 100644 --- a/intern/opencolorio/ocio_capi.cc +++ b/intern/opencolorio/ocio_capi.cc @@ -283,9 +283,9 @@ void OCIO_matrixTransformScale(float * m44, float * offset4, const float *scale4 impl->matrixTransformScale(m44, offset4, scale4f); } -void OCIO_setupGLSLDraw(struct OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRcPtr *processor) +int OCIO_setupGLSLDraw(struct OCIO_GLSLDrawState **state_r, OCIO_ConstProcessorRcPtr *processor) { - impl->setupGLSLDraw(state_r, processor); + return (int) impl->setupGLSLDraw(state_r, processor); } void OCIO_finishGLSLDraw(struct OCIO_GLSLDrawState *state) |