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:
authorDalai Felinto <dfelinto@gmail.com>2013-10-10 18:24:52 +0400
committerDalai Felinto <dfelinto@gmail.com>2013-10-10 18:24:52 +0400
commit180de82e4160f84a13b1d2e20ec7f6c9cad91383 (patch)
tree7bf0e5301a8d80c859e8ae73f46a475f6399da06 /intern/opencolorio
parent0d5856e96e906433fb4db40073f468536c73e1af (diff)
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)"
Diffstat (limited to 'intern/opencolorio')
-rw-r--r--intern/opencolorio/ocio_impl_glsl.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/opencolorio/ocio_impl_glsl.cc b/intern/opencolorio/ocio_impl_glsl.cc
index be8f105fd02..2af3befc8a9 100644
--- a/intern/opencolorio/ocio_impl_glsl.cc
+++ b/intern/opencolorio/ocio_impl_glsl.cc
@@ -48,9 +48,7 @@ using namespace OCIO_NAMESPACE;
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 ***** */