[Bf-blender-cvs] [2a1af5fa483] master: Cleanup: add missing extern "C"

[Jacques Lucke]

Commit: 2a1af5fa4836a5cec6c464d581b4861579136476
Author: Jacques Lucke
Date:   Tue Jun 30 14:01:34 2020 +0200
Branches: master
https://developer.blender.org/rB2a1af5fa4836a5cec6c464d581b4861579136476

Cleanup: add missing extern "C"

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

M	source/blender/nodes/NOD_composite.h
M	source/blender/nodes/NOD_shader.h
M	source/blender/nodes/NOD_texture.h
M	source/blender/nodes/composite/node_composite_util.h
M	source/blender/nodes/intern/node_exec.h
M	source/blender/nodes/shader/node_shader_util.h
M	source/blender/nodes/texture/node_texture_util.h

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

diff --git a/source/blender/nodes/NOD_composite.h b/source/blender/nodes/NOD_composite.h
index 534e9012693..6b1dd239294 100644
--- a/source/blender/nodes/NOD_composite.h
+++ b/source/blender/nodes/NOD_composite.h
@@ -26,6 +26,10 @@
 
 #include "BKE_node.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern struct bNodeTreeType *ntreeType_Composite;
 
 /* ****************** types array for all composite nodes ****************** */
@@ -143,4 +147,8 @@ const char *node_cmp_rlayers_sock_to_pass(int sock_index);
 
 void register_node_type_cmp_custom_group(bNodeType *ntype);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/nodes/NOD_shader.h b/source/blender/nodes/NOD_shader.h
index a89a9e927b9..bf548aea5f4 100644
--- a/source/blender/nodes/NOD_shader.h
+++ b/source/blender/nodes/NOD_shader.h
@@ -26,6 +26,10 @@
 
 #include "BKE_node.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern struct bNodeTreeType *ntreeType_Shader;
 
 /* the type definitions array */
@@ -139,4 +143,8 @@ void register_node_type_sh_tex_white_noise(void);
 
 void register_node_type_sh_custom_group(bNodeType *ntype);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/nodes/NOD_texture.h b/source/blender/nodes/NOD_texture.h
index eaa4952e7e6..07a05f01bc5 100644
--- a/source/blender/nodes/NOD_texture.h
+++ b/source/blender/nodes/NOD_texture.h
@@ -26,6 +26,10 @@
 
 #include "BKE_node.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern struct bNodeTreeType *ntreeType_Texture;
 
 /* ****************** types array for all texture nodes ****************** */
@@ -71,4 +75,8 @@ void register_node_type_tex_proc_noise(void);
 void register_node_type_tex_proc_stucci(void);
 void register_node_type_tex_proc_distnoise(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/nodes/composite/node_composite_util.h b/source/blender/nodes/composite/node_composite_util.h
index 4372ef78bc0..0edc864e98f 100644
--- a/source/blender/nodes/composite/node_composite_util.h
+++ b/source/blender/nodes/composite/node_composite_util.h
@@ -49,6 +49,10 @@
 /* only for forward declarations */
 #include "NOD_composite.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define CMP_SCALE_MAX 12000
 
 bool cmp_node_poll_default(struct bNodeType *ntype, struct bNodeTree *ntree);
@@ -56,4 +60,8 @@ void cmp_node_update_default(struct bNodeTree *UNUSED(ntree), struct bNode *node
 void cmp_node_type_base(
     struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __NODE_COMPOSITE_UTIL_H__ */
diff --git a/source/blender/nodes/intern/node_exec.h b/source/blender/nodes/intern/node_exec.h
index 07c12dc7c46..87a61f0a490 100644
--- a/source/blender/nodes/intern/node_exec.h
+++ b/source/blender/nodes/intern/node_exec.h
@@ -34,6 +34,10 @@
 
 #include "RNA_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct bNode;
 struct bNodeStack;
 struct bNodeTree;
@@ -98,4 +102,8 @@ struct bNodeTreeExec *ntreeTexBeginExecTree_internal(struct bNodeExecContext *co
                                                      bNodeInstanceKey parent_key);
 void ntreeTexEndExecTree_internal(struct bNodeTreeExec *exec);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/nodes/shader/node_shader_util.h b/source/blender/nodes/shader/node_shader_util.h
index 8834de0633e..fbb9979cdfa 100644
--- a/source/blender/nodes/shader/node_shader_util.h
+++ b/source/blender/nodes/shader/node_shader_util.h
@@ -69,6 +69,10 @@
 #include "GPU_texture.h"
 #include "GPU_uniformbuffer.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool sh_node_poll_default(struct bNodeType *ntype, struct bNodeTree *ntree);
 void sh_node_type_base(
     struct bNodeType *ntype, int type, const char *name, short nclass, short flag);
@@ -101,4 +105,8 @@ void ntreeExecGPUNodes(struct bNodeTreeExec *exec,
                        struct GPUMaterial *mat,
                        struct bNode *output_node);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/nodes/texture/node_texture_util.h b/source/blender/nodes/texture/node_texture_util.h
index b3407f68857..7b8581c1f89 100644
--- a/source/blender/nodes/texture/node_texture_util.h
+++ b/source/blender/nodes/texture/node_texture_util.h
@@ -64,6 +64,10 @@
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct TexCallData {
   TexResult *target;
   /* all float[3] */
@@ -124,4 +128,8 @@ void tex_do_preview(bNodePreview *preview,
 
 void params_from_cdata(TexParams *out, TexCallData *in);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif