[Bf-blender-cvs] [a7e92843f72] master: Fix: Build error on windows.
Ray Molenkamp
noreply at git.blender.org
Tue Nov 2 14:44:37 CET 2021
Commit: a7e92843f72efe0f395eb67d24a419f83f60dc70
Author: Ray Molenkamp
Date: Tue Nov 2 07:43:44 2021 -0600
Branches: master
https://developer.blender.org/rBa7e92843f72efe0f395eb67d24a419f83f60dc70
Fix: Build error on windows.
External symbols in C files need
to be marked as such otherwise
the linker will not find them.
===================================================================
M source/blender/draw/engines/image/image_shader.cc
===================================================================
diff --git a/source/blender/draw/engines/image/image_shader.cc b/source/blender/draw/engines/image/image_shader.cc
index f5128fa00c7..1c6abf36505 100644
--- a/source/blender/draw/engines/image/image_shader.cc
+++ b/source/blender/draw/engines/image/image_shader.cc
@@ -29,12 +29,14 @@
#include "image_engine.h"
#include "image_private.hh"
+extern "C" {
extern char datatoc_common_colormanagement_lib_glsl[];
extern char datatoc_common_globals_lib_glsl[];
extern char datatoc_common_view_lib_glsl[];
extern char datatoc_engine_image_frag_glsl[];
extern char datatoc_engine_image_vert_glsl[];
+}
namespace blender::draw::image_engine {
@@ -84,4 +86,3 @@ void IMAGE_shader_free()
}
} // namespace blender::draw::image_engine
-
More information about the Bf-blender-cvs
mailing list