[Bf-blender-cvs] [743443ac147] functions: fix after merge
Jacques Lucke
noreply at git.blender.org
Mon Mar 2 15:45:28 CET 2020
Commit: 743443ac14757b382ae55fb0d73dfd7b6f171597
Author: Jacques Lucke
Date: Mon Mar 2 15:44:31 2020 +0100
Branches: functions
https://developer.blender.org/rB743443ac14757b382ae55fb0d73dfd7b6f171597
fix after merge
===================================================================
M source/blender/blenkernel/BKE_mesh_runtime.h
M source/blender/blenkernel/BKE_node.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h
index d1d8c03c474..fdddafcc71f 100644
--- a/source/blender/blenkernel/BKE_mesh_runtime.h
+++ b/source/blender/blenkernel/BKE_mesh_runtime.h
@@ -42,10 +42,6 @@ struct Mesh;
struct Object;
struct Scene;
-#ifdef __cplusplus
-extern "C" {
-#endif
-
void BKE_mesh_runtime_reset(struct Mesh *mesh);
void BKE_mesh_runtime_reset_on_copy(struct Mesh *mesh, const int flag);
int BKE_mesh_runtime_looptri_len(const struct Mesh *mesh);
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index c1e9832e925..e8ccc0c2348 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -24,10 +24,6 @@
* \ingroup bke
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include "BLI_compiler_compat.h"
#include "BLI_ghash.h"
More information about the Bf-blender-cvs
mailing list