From 180de82e4160f84a13b1d2e20ec7f6c9cad91383 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Thu, 10 Oct 2013 14:24:52 +0000 Subject: 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)" --- intern/opencolorio/ocio_impl_glsl.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'intern') 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 ***** */ -- cgit v1.2.3