[Bf-blender-cvs] [5de56f95966] master: Cleanup: make remaining blenkernel headers work in C++

Jacques Lucke noreply at git.blender.org
Mon Mar 2 15:11:42 CET 2020 

Commit: 5de56f95966352cda588d3c830f73dfaa1c19412
Author: Jacques Lucke
Date:   Mon Mar 2 15:07:49 2020 +0100
Branches: master
https://developer.blender.org/rB5de56f95966352cda588d3c830f73dfaa1c19412

Cleanup: make remaining blenkernel headers work in C++

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

M	source/blender/blenkernel/BKE_DerivedMesh.h
M	source/blender/blenkernel/BKE_addon.h
M	source/blender/blenkernel/BKE_anim.h
M	source/blender/blenkernel/BKE_appdir.h
M	source/blender/blenkernel/BKE_armature.h
M	source/blender/blenkernel/BKE_autoexec.h
M	source/blender/blenkernel/BKE_boids.h
M	source/blender/blenkernel/BKE_bpath.h
M	source/blender/blenkernel/BKE_brush.h
M	source/blender/blenkernel/BKE_bvhutils.h
M	source/blender/blenkernel/BKE_callbacks.h
M	source/blender/blenkernel/BKE_ccg.h
M	source/blender/blenkernel/BKE_cdderivedmesh.h
M	source/blender/blenkernel/BKE_cloth.h
M	source/blender/blenkernel/BKE_collision.h
M	source/blender/blenkernel/BKE_colortools.h
M	source/blender/blenkernel/BKE_curve.h
M	source/blender/blenkernel/BKE_curveprofile.h
M	source/blender/blenkernel/BKE_customdata_file.h
M	source/blender/blenkernel/BKE_displist.h
M	source/blender/blenkernel/BKE_displist_tangent.h
M	source/blender/blenkernel/BKE_dynamicpaint.h
M	source/blender/blenkernel/BKE_editlattice.h
M	source/blender/blenkernel/BKE_editmesh.h
M	source/blender/blenkernel/BKE_editmesh_bvh.h
M	source/blender/blenkernel/BKE_editmesh_cache.h
M	source/blender/blenkernel/BKE_editmesh_tangent.h
M	source/blender/blenkernel/BKE_effect.h
M	source/blender/blenkernel/BKE_fluid.h
M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/BKE_gpencil_modifier.h
M	source/blender/blenkernel/BKE_icons.h
M	source/blender/blenkernel/BKE_idcode.h
M	source/blender/blenkernel/BKE_kelvinlet.h
M	source/blender/blenkernel/BKE_keyconfig.h
M	source/blender/blenkernel/BKE_lattice.h
M	source/blender/blenkernel/BKE_lib_override.h
M	source/blender/blenkernel/BKE_lib_query.h
M	source/blender/blenkernel/BKE_lightprobe.h
M	source/blender/blenkernel/BKE_main_idmap.h
M	source/blender/blenkernel/BKE_mask.h
M	source/blender/blenkernel/BKE_mball.h
M	source/blender/blenkernel/BKE_mball_tessellate.h
M	source/blender/blenkernel/BKE_mesh_iterators.h
M	source/blender/blenkernel/BKE_mesh_mapping.h
M	source/blender/blenkernel/BKE_mesh_mirror.h
M	source/blender/blenkernel/BKE_mesh_remap.h
M	source/blender/blenkernel/BKE_mesh_remesh_voxel.h
M	source/blender/blenkernel/BKE_mesh_runtime.h
M	source/blender/blenkernel/BKE_mesh_tangent.h
M	source/blender/blenkernel/BKE_movieclip.h
M	source/blender/blenkernel/BKE_multires.h
M	source/blender/blenkernel/BKE_nla.h
M	source/blender/blenkernel/BKE_node.h
M	source/blender/blenkernel/BKE_outliner_treehash.h
M	source/blender/blenkernel/BKE_packedFile.h
M	source/blender/blenkernel/BKE_paint.h
M	source/blender/blenkernel/BKE_particle.h
M	source/blender/blenkernel/BKE_pointcache.h
M	source/blender/blenkernel/BKE_rigidbody.h
M	source/blender/blenkernel/BKE_screen.h
M	source/blender/blenkernel/BKE_shader_fx.h
M	source/blender/blenkernel/BKE_shrinkwrap.h
M	source/blender/blenkernel/BKE_softbody.h
M	source/blender/blenkernel/BKE_speaker.h
M	source/blender/blenkernel/BKE_studiolight.h
M	source/blender/blenkernel/BKE_subdiv.h
M	source/blender/blenkernel/BKE_subdiv_ccg.h
M	source/blender/blenkernel/BKE_subdiv_deform.h
M	source/blender/blenkernel/BKE_subdiv_eval.h
M	source/blender/blenkernel/BKE_subdiv_foreach.h
M	source/blender/blenkernel/BKE_subdiv_mesh.h
M	source/blender/blenkernel/BKE_subdiv_topology.h
M	source/blender/blenkernel/BKE_subsurf.h
M	source/blender/blenkernel/BKE_tracking.h
M	source/blender/blenkernel/BKE_undo_system.h
M	source/blender/blenkernel/BKE_workspace.h
M	source/blender/blenkernel/BKE_world.h
M	source/blender/blenkernel/nla_private.h
M	source/blender/blenkernel/particle_private.h
M	source/blender/blenkernel/tracking_private.h

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

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 575fdc4b8ff..3deba174738 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -72,6 +72,10 @@
 #include "BKE_customdata.h"
 #include "BKE_bvhutils.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BMEditMesh;
 struct CCGElem;
 struct CCGKey;
@@ -383,4 +387,8 @@ void DM_debug_print_cdlayers(CustomData *cdata);
 bool DM_is_valid(DerivedMesh *dm);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_DERIVEDMESH_H__ */
diff --git a/source/blender/blenkernel/BKE_addon.h b/source/blender/blenkernel/BKE_addon.h
index c3b821d69f3..7bb1761dfbe 100644
--- a/source/blender/blenkernel/BKE_addon.h
+++ b/source/blender/blenkernel/BKE_addon.h
@@ -20,6 +20,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ListBase;
 struct bAddon;
 
@@ -49,4 +53,8 @@ struct bAddon *BKE_addon_ensure(struct ListBase *addon_list, const char *module)
 bool BKE_addon_remove_safe(struct ListBase *addon_list, const char *module);
 void BKE_addon_free(struct bAddon *addon);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_ADDON_H__ */
diff --git a/source/blender/blenkernel/BKE_anim.h b/source/blender/blenkernel/BKE_anim.h
index dce6f337885..38af96c2ff0 100644
--- a/source/blender/blenkernel/BKE_anim.h
+++ b/source/blender/blenkernel/BKE_anim.h
@@ -22,6 +22,11 @@
 /** \file
  * \ingroup bke
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct ListBase;
 struct Object;
@@ -89,4 +94,8 @@ typedef struct DupliObject {
   unsigned int random_id;
 } DupliObject;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_appdir.h b/source/blender/blenkernel/BKE_appdir.h
index b35abb1ecef..e49fc260810 100644
--- a/source/blender/blenkernel/BKE_appdir.h
+++ b/source/blender/blenkernel/BKE_appdir.h
@@ -19,6 +19,11 @@
 /** \file
  * \ingroup bli
  */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ListBase;
 
 /* note on naming: typical _get() suffix is omitted here,
@@ -93,4 +98,8 @@ enum {
 #define BLENDER_HISTORY_FILE "recent-files.txt"
 #define BLENDER_PLATFORM_SUPPORT_FILE "platform_support.txt"
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_APPDIR_H__ */
diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 4012ff60b98..583d8539c03 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Bone;
 struct Depsgraph;
 struct ListBase;
@@ -58,9 +62,6 @@ typedef struct PoseTree {
 } PoseTree;
 
 /*  Core armature functionality */
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 struct bArmature *BKE_armature_add(struct Main *bmain, const char *name);
 struct bArmature *BKE_armature_from_object(struct Object *ob);
diff --git a/source/blender/blenkernel/BKE_autoexec.h b/source/blender/blenkernel/BKE_autoexec.h
index 00d2ad85153..bb847d49a4b 100644
--- a/source/blender/blenkernel/BKE_autoexec.h
+++ b/source/blender/blenkernel/BKE_autoexec.h
@@ -20,6 +20,14 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 bool BKE_autoexec_match(const char *path);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_AUTOEXEC_H__ */
diff --git a/source/blender/blenkernel/BKE_boids.h b/source/blender/blenkernel/BKE_boids.h
index 892b745cc2d..f748143818c 100644
--- a/source/blender/blenkernel/BKE_boids.h
+++ b/source/blender/blenkernel/BKE_boids.h
@@ -26,6 +26,10 @@
 
 #include "DNA_boid_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct RNG;
 
 typedef struct BoidBrainData {
@@ -53,4 +57,9 @@ BoidState *boid_duplicate_state(BoidSettings *boids, BoidState *state);
 void boid_free_settings(BoidSettings *boids);
 BoidSettings *boid_copy_settings(const BoidSettings *boids);
 BoidState *boid_get_current_state(BoidSettings *boids);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_bpath.h b/source/blender/blenkernel/BKE_bpath.h
index eaf37f8fa6e..cc8dd0d5b33 100644
--- a/source/blender/blenkernel/BKE_bpath.h
+++ b/source/blender/blenkernel/BKE_bpath.h
@@ -23,6 +23,10 @@
 #ifndef __BKE_BPATH_H__
 #define __BKE_BPATH_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct ListBase;
 struct Main;
@@ -85,4 +89,8 @@ void BKE_bpath_absolute_convert(struct Main *bmain,
                                 const char *basedir,
                                 struct ReportList *reports);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_BPATH_H__ */
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h
index c7f6c09b886..b6575094202 100644
--- a/source/blender/blenkernel/BKE_brush.h
+++ b/source/blender/blenkernel/BKE_brush.h
@@ -23,6 +23,12 @@
  * General operations for brushes.
  */
 
+#include "DNA_object_enums.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 enum eCurveMappingPreset;
 struct Brush;
 struct ImBuf;
@@ -34,8 +40,6 @@ struct UnifiedPaintSettings;
 
 // enum eCurveMappingPreset;
 
-#include "DNA_object_enums.h"
-
 /* globals for brush execution */
 void BKE_brush_system_init(void);
 void BKE_brush_system_exit(void);
@@ -140,4 +144,8 @@ void BKE_brush_scale_size(int *r_brush_size,
 /* debugging only */
 void BKE_brush_debug_print_state(struct Brush *br);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_bvhutils.h b/source/blender/blenkernel/BKE_bvhutils.h
index fdcb4066482..b83ebf8ce09 100644
--- a/source/blender/blenkernel/BKE_bvhutils.h
+++ b/source/blender/blenkernel/BKE_bvhutils.h
@@ -26,6 +26,10 @@
 #include "BLI_bitmap.h"
 #include "BLI_kdopbvh.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * This header encapsulates necessary code to build a BVH
  */
@@ -244,4 +248,8 @@ bool bvhcache_has_tree(const BVHCache *cache, const BVHTree *tree);
 void bvhcache_insert(BVHCache **cache_p, BVHTree *tree, int type);
 void bvhcache_free(BVHCache **cache_p);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_callbacks.h b/source/blender/blenkernel/BKE_callbacks.h
index e15cf7fed18..284948da634 100644
--- a/source/blender/blenkernel/BKE_callbacks.h
+++ b/source/blender/blenkernel/BKE_callbacks.h
@@ -21,6 +21,10 @@
 #ifndef __BKE_CALLBACKS_H__
 #define __BKE_CALLBACKS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Depsgraph;
 struct ID;
 struct Main;
@@ -81,4 +85,8 @@ void BKE_callback_add(bCallbackFuncStore *funcstore, eCbEvent evt);
 void BKE_callback_global_init(void);
 void BKE_callback_global_finalize(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BKE_CALLBACKS_H__ */
diff --git a/source/blender/blenkernel/BKE_ccg.h b/source/blender/blenkernel/BKE_ccg.h
index ebea8dcbd22..ad1e05ee367 100644
--- a/source/blender/blenkernel/BKE_ccg.h
+++ b/source/blender/blenkernel/BKE_ccg.h
@@ -31,6 +31,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct CCGSubSurf;
 
 /* Each CCGElem is CCGSubSurf's representation of a subdivided
@@ -159,4 +163,8 @@ BLI_INLINE CCGElem *CCG_elem_next(const CCGKey *key, CCGElem *elem)
   return CCG_elem_offset(key, elem, 1);
 }
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_cdderivedmesh.h b/source/blender/blenkernel/BKE_cdderivedmesh.h
index 7b84f2f04ab..1d6db319eb7 100644
--- a/source/blender/blenkernel/BKE_cdderivedmesh.h
+++ b/source/blender/blenkernel/BKE_cdderivedmesh.h
@@ -29,6 +29,10 @@
 #ifndef __BKE_CDDERIVEDMESH_H__
 #define __BKE_CDDERIVEDMESH_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct DerivedMesh;
 struct Mesh;
 
@@ -42,4 +46,8 @@ struct DerivedMesh *CDDM_from_mesh(struct Mesh *mesh);
  * custom element data. */
 struct DerivedMesh *CDDM_copy(struct DerivedMesh *dm);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h
index 883f4a137e7..d5fb55af06c 100644
--- a/source/blender/blenkernel/BKE_cloth.h
+++ b/source/blender/blenkernel/BKE_cloth.h
@@ -26,6 +26,10 @@
 #include <float.h>
 #include "BLI_math_inline.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ClothModifierData;
 struct CollisionModifierData;
 struct Depsgraph;
@@ -299,4 +303,8 @@ void cloth_parallel_transport_hair_frame(float mat[3][3],
 
 ////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h
index 5bf697e5df9..1b6638f8f86 100644
--- a/source/blender/blenkernel/BKE_collision.h
+++ b/source/blender/blenkernel/BKE_collision.h
@@ -34,6 +34,10 @@
 
 #include "BLI_kdopbvh.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Collection;
 struct CollisionModifierData;
 struct Depsgraph;
@@ -171,4 +175,8 @@ void BKE_collider_cache_free(struct ListBase **colliders);
 
 /////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index e4ea1dad086..94b8d59b3db 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ColorManagedColorspaceSettings;
 struct ColorManagedDisplaySettings;
 struct ColorManagedViewSettings;
@@ -137,4 +141,9 @@ void BKE_color_managed_colorspace_settings_copy(
 bool BKE_color_managed_colorspace_settings_equals(
     const struct ColorManagedColorspaceSettings *settings1,
     const struct ColorManagedColorspaceSettings *settings2);
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 8fd33fff803..1eff97bef2f 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -23,6 +23,10 @@
  * \ingroup bke
  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BezTriple;
 struct Curve;
 struct Depsgraph;
@@ -292,4 +296,8 @@ void BKE_

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list