[Bf-blender-cvs] [680b70f0931] master: Cleanup: make remaining editor include headers work in C++

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

Commit: 680b70f093168af700eff2b74bafe41165f88c32
Author: Jacques Lucke
Date:   Mon Mar 2 15:09:10 2020 +0100
Branches: master
https://developer.blender.org/rB680b70f093168af700eff2b74bafe41165f88c32

Cleanup: make remaining editor include headers work in C++

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

M	source/blender/editors/include/BIF_glutil.h
M	source/blender/editors/include/ED_anim_api.h
M	source/blender/editors/include/ED_buttons.h
M	source/blender/editors/include/ED_clip.h
M	source/blender/editors/include/ED_curve.h
M	source/blender/editors/include/ED_datafiles.h
M	source/blender/editors/include/ED_fileselect.h
M	source/blender/editors/include/ED_gizmo_library.h
M	source/blender/editors/include/ED_gizmo_utils.h
M	source/blender/editors/include/ED_gpencil.h
M	source/blender/editors/include/ED_image.h
M	source/blender/editors/include/ED_info.h
M	source/blender/editors/include/ED_keyframes_draw.h
M	source/blender/editors/include/ED_keyframes_edit.h
M	source/blender/editors/include/ED_lattice.h
M	source/blender/editors/include/ED_logic.h
M	source/blender/editors/include/ED_markers.h
M	source/blender/editors/include/ED_mask.h
M	source/blender/editors/include/ED_mball.h
M	source/blender/editors/include/ED_node.h
M	source/blender/editors/include/ED_numinput.h
M	source/blender/editors/include/ED_outliner.h
M	source/blender/editors/include/ED_paint.h
M	source/blender/editors/include/ED_particle.h
M	source/blender/editors/include/ED_physics.h
M	source/blender/editors/include/ED_render.h
M	source/blender/editors/include/ED_scene.h
M	source/blender/editors/include/ED_screen.h
M	source/blender/editors/include/ED_screen_types.h
M	source/blender/editors/include/ED_sculpt.h
M	source/blender/editors/include/ED_select_utils.h
M	source/blender/editors/include/ED_sequencer.h
M	source/blender/editors/include/ED_sound.h
M	source/blender/editors/include/ED_space_api.h
M	source/blender/editors/include/ED_text.h
M	source/blender/editors/include/ED_time_scrub_ui.h
M	source/blender/editors/include/ED_transform.h
M	source/blender/editors/include/ED_transform_snap_object_context.h
M	source/blender/editors/include/ED_transverts.h
M	source/blender/editors/include/ED_types.h
M	source/blender/editors/include/ED_undo.h
M	source/blender/editors/include/ED_userpref.h
M	source/blender/editors/include/ED_util.h
M	source/blender/editors/include/ED_uvedit.h
M	source/blender/editors/include/ED_view3d.h
M	source/blender/editors/include/UI_interface_icons.h
M	source/blender/editors/include/UI_resources.h
M	source/blender/editors/include/UI_view2d.h

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

diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index a49f02d28fe..04f9edeaf3a 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -24,6 +24,10 @@
 #ifndef __BIF_GLUTIL_H__
 #define __BIF_GLUTIL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct rcti;
 
 struct ColorManagedDisplaySettings;
@@ -177,4 +181,8 @@ void bglPolygonOffset(float viewdist, float dist);
 
 void immDrawBorderCorners(unsigned int pos, const struct rcti *border, float zoomx, float zoomy);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __BIF_GLUTIL_H__ */
diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.h
index e2f10357f19..f8d0300cb46 100644
--- a/source/blender/editors/include/ED_anim_api.h
+++ b/source/blender/editors/include/ED_anim_api.h
@@ -24,6 +24,10 @@
 #ifndef __ED_ANIM_API_H__
 #define __ED_ANIM_API_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct AnimData;
 struct Depsgraph;
 struct ID;
@@ -859,4 +863,8 @@ void animviz_calc_motionpaths(struct Depsgraph *depsgraph,
 
 void animviz_get_object_motionpaths(struct Object *ob, ListBase *targets);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_ANIM_API_H__ */
diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.h
index 9ff2678b53e..2eaef5e82e0 100644
--- a/source/blender/editors/include/ED_buttons.h
+++ b/source/blender/editors/include/ED_buttons.h
@@ -23,4 +23,12 @@
 #ifndef __ED_BUTTONS_H__
 #define __ED_BUTTONS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_BUTTONS_H__ */
diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.h
index 22bf22e04d3..064e957225e 100644
--- a/source/blender/editors/include/ED_clip.h
+++ b/source/blender/editors/include/ED_clip.h
@@ -24,6 +24,10 @@
 #ifndef __ED_CLIP_H__
 #define __ED_CLIP_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct ImBuf;
 struct Main;
@@ -93,4 +97,8 @@ void ED_space_clip_set_mask(struct bContext *C, struct SpaceClip *sc, struct Mas
 /* ** clip_ops.c ** */
 void ED_operatormacros_clip(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_CLIP_H__ */
diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h
index d6d5ae299b7..95c454043da 100644
--- a/source/blender/editors/include/ED_curve.h
+++ b/source/blender/editors/include/ED_curve.h
@@ -24,6 +24,10 @@
 #ifndef __ED_CURVE_H__
 #define __ED_CURVE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BPoint;
 struct Base;
 struct BezTriple;
@@ -104,4 +108,8 @@ void ED_font_undosys_type(struct UndoType *ut);
 void printknots(struct Object *obedit);
 #endif
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_CURVE_H__ */
diff --git a/source/blender/editors/include/ED_datafiles.h b/source/blender/editors/include/ED_datafiles.h
index ada90205b4a..c1f5eddd8df 100644
--- a/source/blender/editors/include/ED_datafiles.h
+++ b/source/blender/editors/include/ED_datafiles.h
@@ -24,6 +24,10 @@
 #ifndef __ED_DATAFILES_H__
 #define __ED_DATAFILES_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Datafiles embedded in Blender */
 
 extern int datatoc_startup_blend_size;
@@ -300,4 +304,8 @@ extern char datatoc_gp_brush_erase_hard_png[];
 extern int datatoc_gp_brush_erase_stroke_png_size;
 extern char datatoc_gp_brush_erase_stroke_png[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_DATAFILES_H__ */
diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.h
index 98e1e99116f..71d23d5ebad 100644
--- a/source/blender/editors/include/ED_fileselect.h
+++ b/source/blender/editors/include/ED_fileselect.h
@@ -24,6 +24,10 @@
 #ifndef __ED_FILESELECT_H__
 #define __ED_FILESELECT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct FileSelectParams;
 struct ScrArea;
@@ -200,4 +204,8 @@ void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name);
 int ED_fsmenu_entry_get_icon(struct FSMenuEntry *fsentry);
 void ED_fsmenu_entry_set_icon(struct FSMenuEntry *fsentry, const int icon);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_FILESELECT_H__ */
diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.h
index e09f101af73..07eade23506 100644
--- a/source/blender/editors/include/ED_gizmo_library.h
+++ b/source/blender/editors/include/ED_gizmo_library.h
@@ -25,6 +25,10 @@
 #ifndef __ED_GIZMO_LIBRARY_H__
 #define __ED_GIZMO_LIBRARY_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* initialize gizmos */
 void ED_gizmotypes_arrow_3d(void);
 void ED_gizmotypes_button_2d(void);
@@ -237,4 +241,8 @@ void ED_gizmotypes_dial_3d_draw_util(const float matrix_basis[4][4],
                                      const bool select,
                                      struct Dial3dParams *params);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_GIZMO_LIBRARY_H__ */
diff --git a/source/blender/editors/include/ED_gizmo_utils.h b/source/blender/editors/include/ED_gizmo_utils.h
index 8c494bdf18c..70ff8a8d32f 100644
--- a/source/blender/editors/include/ED_gizmo_utils.h
+++ b/source/blender/editors/include/ED_gizmo_utils.h
@@ -23,6 +23,10 @@
 #ifndef __ED_GIZMO_UTILS_H__
 #define __ED_GIZMO_UTILS_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct bContext;
 struct wmGizmoGroupType;
 
@@ -39,4 +43,8 @@ bool ED_gizmo_poll_or_unlink_delayed_from_tool_ex(const struct bContext *C,
 bool ED_gizmo_poll_or_unlink_delayed_from_tool(const struct bContext *C,
                                                struct wmGizmoGroupType *gzgt);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_GIZMO_UTILS_H__ */
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 5073207daa5..d8088dd8454 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -24,6 +24,10 @@
 #ifndef __ED_GPENCIL_H__
 #define __ED_GPENCIL_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ID;
 struct ListBase;
 struct PointerRNA;
@@ -302,4 +306,8 @@ struct tGPspoint *ED_gpencil_sbuffer_ensure(struct tGPspoint *buffer_array,
 /* Tag all scene grease pencil object to update. */
 void ED_gpencil_tag_scene_gpencil(struct Scene *scene);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_GPENCIL_H__ */
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h
index d78c2620253..e97630cfb99 100644
--- a/source/blender/editors/include/ED_image.h
+++ b/source/blender/editors/include/ED_image.h
@@ -27,6 +27,10 @@
 #include "DNA_listBase.h"
 #include "DNA_space_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct ARegion;
 struct ImBuf;
 struct Image;
@@ -142,4 +146,8 @@ ListBase ED_image_filesel_detect_sequences(struct Main *bmain,
                                            struct wmOperator *op,
                                            const bool detect_udim);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_IMAGE_H__ */
diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.h
index 8a84d3646f8..82662a6b118 100644
--- a/source/blender/editors/include/ED_info.h
+++ b/source/blender/editors/include/ED_info.h
@@ -23,6 +23,10 @@
 #ifndef __ED_INFO_H__
 #define __ED_INFO_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Main;
 
 /* info_stats.c */
@@ -31,4 +35,8 @@ const char *ED_info_stats_string(struct Main *bmain,
                                  struct Scene *scene,
                                  struct ViewLayer *view_layer);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_INFO_H__ */
diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.h
index 2630feaa9d3..7000075d4b5 100644
--- a/source/blender/editors/include/ED_keyframes_draw.h
+++ b/source/blender/editors/include/ED_keyframes_draw.h
@@ -24,6 +24,10 @@
 #ifndef __ED_KEYFRAMES_DRAW_H__
 #define __ED_KEYFRAMES_DRAW_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct AnimData;
 struct CacheFile;
 struct DLRBT_Tree;
@@ -266,4 +270,8 @@ bool actkeyblock_is_valid(ActKeyColumn *ab);
 /* Checks if ActKeyColumn can be used as a block (i.e. drawn/used to detect "holds") */
 int actkeyblock_get_valid_hold(ActKeyColumn *ab);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /*  __ED_KEYFRAMES_DRAW_H__ */
diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.h
index c347d75fa66..d0d07fc3245 100644
--- a/source/blender/editors/include/ED_keyframes_edit.h
+++ b/source/blender/editors/include/ED_keyframes_edit.h
@@ -24,6 +24,10 @@
 #ifndef __ED_KEYFRAMES_EDIT_H__
 #define __ED_KEYFRAMES_EDIT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct BezTriple;
 struct FCurve;
 struct Scene;
@@ -325,4 +329,8 @@ short paste_animedit_keys(struct bAnimContext *ac,
 
 /* ************************************************ */
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_KEYFRAMES_EDIT_H__ */
diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.h
index 5c3c3555d56..2e4b9472ce7 100644
--- a/source/blender/editors/include/ED_lattice.h
+++ b/source/blender/editors/include/ED_lattice.h
@@ -24,6 +24,10 @@
 #ifndef __ED_LATTICE_H__
 #define __ED_LATTICE_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct Base;
 struct Object;
 struct UndoType;
@@ -44,4 +48,8 @@ bool ED_lattice_deselect_all_multi(struct bContext *C);
 /* editlattice_undo.c */
 void ED_lattice_undosys_type(struct UndoType *ut);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __ED_LATTICE_H__ */
diff --git a/source/blender/editors/include/ED_logic.h b/source/blender/editors/include/ED_logic.h
index 8158bee15f3..ae2d5038321 100644
--- a/source/blender/editors/include/ED_logic.h
+++ b/source/blender/editors/include/ED_logic.h
@@ -24,7 +24,15 @@
 #ifndef __ED_LOGIC_H__
 #define __ED_LOGIC_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* logic_ops.c */
 void ED_operatortypes_

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list