[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60650] trunk/blender/intern/opencolorio/ ocio_impl_glsl.cc: Fix compilation error of OCIO with MSVC

Sergey Sharybin sergey.vfx at gmail.com
Wed Oct 9 22:45:29 CEST 2013


Revision: 60650
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60650
Author:   nazgul
Date:     2013-10-09 20:45:29 +0000 (Wed, 09 Oct 2013)
Log Message:
-----------
Fix compilation error of OCIO with MSVC

Modified Paths:
--------------
    trunk/blender/intern/opencolorio/ocio_impl_glsl.cc

Modified: trunk/blender/intern/opencolorio/ocio_impl_glsl.cc
===================================================================
--- trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-10-09 20:27:38 UTC (rev 60649)
+++ trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-10-09 20:45:29 UTC (rev 60650)
@@ -48,7 +48,9 @@
 
 static const int LUT3D_EDGE_SIZE = 64;
 
-extern char datatoc_gpu_shader_display_transform_glsl[];
+extern "C" {
+	extern char datatoc_gpu_shader_display_transform_glsl[];
+}
 
 /* **** OpenGL drawing routines using GLSL for color space transform ***** */
 




More information about the Bf-blender-cvs mailing list