[Bf-blender-cvs] [510651ed727] blender2.8: Attempt to fix OpenColorIO issues on Mac

[Dalai Felinto]

Commit: 510651ed7271320c566c57d2fbb6979c9421348e
Author: Dalai Felinto
Date:   Wed Aug 30 15:06:53 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB510651ed7271320c566c57d2fbb6979c9421348e

Attempt to fix OpenColorIO issues on Mac

We cannot have version130 there (should use version 330 instead).
Patch suggested by Brecht Van Lommel

===================================================================

M       intern/opencolorio/ocio_impl_glsl.cc

===================================================================

diff --git a/intern/opencolorio/ocio_impl_glsl.cc 
b/intern/opencolorio/ocio_impl_glsl.cc
index d3de306edc8..c8b64f72440 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -354,7 +354,7 @@ bool OCIOImpl::setupGLSLDraw(OCIO_GLSLDrawState **state_r, 
OCIO_ConstProcessorRc
                std::ostringstream osv;
 
                if (supportGLSL13()) {
-                       osv << "#version 130\n";
+                       osv << "#version 330\n";
                }
                else {
                        osv << "#version 120\n";
@@ -368,7 +368,7 @@ bool OCIOImpl::setupGLSLDraw(OCIO_GLSLDrawState **state_r, 
OCIO_ConstProcessorRc
                std::ostringstream os;
 
                if (supportGLSL13()) {
-                       os << "#version 130\n";
+                       os << "#version 330\n";
                }
                else {
                        os << "#define USE_TEXTURE_SIZE\n";

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs