[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60664] trunk/blender/intern/opencolorio/ ocio_impl_glsl.cc: ocio build fix for Windows

Dalai Felinto dfelinto at gmail.com
Thu Oct 10 16:24:53 CEST 2013


Revision: 60664
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60664
Author:   dfelinto
Date:     2013-10-10 14:24:52 +0000 (Thu, 10 Oct 2013)
Log Message:
-----------
ocio build fix for Windows
report by email and patch by Benoit Bolsee

"It is a basic compilation bug (variable defined in a c file and declared
in the c++ file: name decoration will change the name in the c++ file
and the linker will not find it)"

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-10 13:09:00 UTC (rev 60663)
+++ trunk/blender/intern/opencolorio/ocio_impl_glsl.cc	2013-10-10 14:24:52 UTC (rev 60664)
@@ -48,9 +48,7 @@
 
 static const int LUT3D_EDGE_SIZE = 64;
 
-extern "C" {
-	extern char datatoc_gpu_shader_display_transform_glsl[];
-}
+extern "C" 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