Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-10-10 00:45:29 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-10-10 00:45:29 +0400
commit0a862cb61a5193b1a0effd3926ba53286d04e55e (patch)
tree8164ff23a00a249377788e83128d35311ddfb555 /intern/opencolorio
parentfeabc7916f6242954a8d2d2c77ff391e691c5bdd (diff)
Fix compilation error of OCIO with MSVC
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/ocio_impl_glsl.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index a10afcad200..be8f105fd02 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -48,7 +48,9 @@ using namespace OCIO_NAMESPACE;
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 ***** */