[Bf-blender-cvs] [f937c186ded] master: Fix build error on WIN32 from `_bpy.context_members`
Campbell Barton
noreply at git.blender.org
Wed May 18 11:40:50 CEST 2022
Commit: f937c186dedeec4ead1ead9c16646c4aaebafd1b
Author: Campbell Barton
Date: Wed May 18 19:24:08 2022 +1000
Branches: master
https://developer.blender.org/rBf937c186dedeec4ead1ead9c16646c4aaebafd1b
Fix build error on WIN32 from `_bpy.context_members`
As of [0] which references context arrays from the Python API,
C++ name mangling caused 'node_context_dir' not to be found for WIN32.
[0]: c8edc458d13c0483907d0fe6f44f6e2887263b57
===================================================================
M source/blender/editors/space_node/node_intern.hh
M source/blender/editors/space_node/space_node.cc
===================================================================
diff --git a/source/blender/editors/space_node/node_intern.hh b/source/blender/editors/space_node/node_intern.hh
index 0c02af8a18e..924537d0e8a 100644
--- a/source/blender/editors/space_node/node_intern.hh
+++ b/source/blender/editors/space_node/node_intern.hh
@@ -31,7 +31,9 @@ struct wmKeyConfig;
struct wmWindow;
/* Outside of blender namespace to avoid Python documentation build error with `ctypes`. */
+extern "C" {
extern const char *node_context_dir[];
+};
namespace blender::ed::space_node {
diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc
index 348fb926d17..3963186f73b 100644
--- a/source/blender/editors/space_node/space_node.cc
+++ b/source/blender/editors/space_node/space_node.cc
@@ -826,8 +826,10 @@ static void node_region_listener(const wmRegionListenerParams *params)
} // namespace blender::ed::space_node
/* Outside of blender namespace to avoid Python documentation build error with `ctypes`. */
+extern "C" {
const char *node_context_dir[] = {
"selected_nodes", "active_node", "light", "material", "world", nullptr};
+};
namespace blender::ed::space_node {
More information about the Bf-blender-cvs
mailing list