From f871d9a82f06e70fb26cbe0bfbd4db18d481059c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 2 Apr 2013 17:28:29 +0000 Subject: 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. --- intern/opencolorio/ocio_capi.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/opencolorio/ocio_capi.cc') 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) -- cgit v1.2.3