[Bf-blender-cvs] [b9c7c904ede] master: GPUShader: Fix linking with MSVC

Clément Foucault noreply at git.blender.org
Wed Jul 29 16:08:37 CEST 2020


Commit: b9c7c904ede17afc3861a2d58d1ac65a6e87f664
Author: Clément Foucault
Date:   Wed Jul 29 16:07:51 2020 +0200
Branches: master
https://developer.blender.org/rBb9c7c904ede17afc3861a2d58d1ac65a6e87f664

GPUShader: Fix linking with MSVC

===================================================================

M	source/blender/gpu/intern/gpu_shader.cc

===================================================================

diff --git a/source/blender/gpu/intern/gpu_shader.cc b/source/blender/gpu/intern/gpu_shader.cc
index e0a1456d92c..a2aace218aa 100644
--- a/source/blender/gpu/intern/gpu_shader.cc
+++ b/source/blender/gpu/intern/gpu_shader.cc
@@ -44,7 +44,7 @@
 
 #include "gpu_shader_private.h"
 
-extern char datatoc_gpu_shader_colorspace_lib_glsl[];
+extern "C" char datatoc_gpu_shader_colorspace_lib_glsl[];
 
 /* Adjust these constants as needed. */
 #define MAX_DEFINE_LENGTH 256



More information about the Bf-blender-cvs mailing list