Merge branch 'blender-v2.90-release'

4 files changed, 32 insertions, 0 deletions

diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
index 07a3f0445bb..1066f009214 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
@@ -52,6 +52,10 @@ struct wmWindowManager;
 
 #include "wm_gizmo_fn.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* -------------------------------------------------------------------- */
 /* wmGizmo */
 
@@ -396,4 +400,8 @@ void WM_gizmo_group_tag_remove(struct wmGizmoGroup *gzgroup);
 bool WM_gizmo_group_type_poll(const struct bContext *C, const struct wmGizmoGroupType *gzgt);
 void WM_gizmo_group_refresh(const struct bContext *C, struct wmGizmoGroup *gzgroup);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WM_GIZMO_API_H__ */
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.h b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
index 3863e3bd797..5def7f8d2f9 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_types.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.h
@@ -40,6 +40,10 @@ struct wmKeyConfig;
 
 #include "DNA_listBase.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* -------------------------------------------------------------------- */
 /* Enum Typedef's */
 
@@ -506,4 +510,8 @@ typedef enum eWM_GizmoFlagMapDrawStep {
 } eWM_GizmoFlagMapDrawStep;
 #define WM_GIZMOMAP_DRAWSTEP_MAX 2
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WM_GIZMO_TYPES_H__ */
diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_fn.h b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
index 58b58fa01d0..00a3f476bac 100644
--- a/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_fn.h
@@ -27,6 +27,10 @@
 
 struct wmMsgBus;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* wmGizmoGroup */
 typedef bool (*wmGizmoGroupFnPoll)(const struct bContext *,
                                    struct wmGizmoGroupType *) ATTR_WARN_UNUSED_RESULT;
@@ -85,4 +89,8 @@ typedef struct wmGizmoPropertyFnParams {
   void *user_data;
 } wmGizmoPropertyFnParams;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WM_GIZMO_FN_H__ */
diff --git a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
index cc9ccc5f4bb..edded4c7620 100644
--- a/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
+++ b/source/blender/windowmanager/gizmo/wm_gizmo_wmapi.h
@@ -36,6 +36,10 @@ struct wmEventHandler_Op;
 struct wmGizmoMap;
 struct wmOperatorType;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* -------------------------------------------------------------------- */
 /* wmGizmo */
 
@@ -92,4 +96,8 @@ struct ListBase *wm_gizmomap_groups_get(wmGizmoMap *gzmap);
 
 void wm_gizmomaptypes_free(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __WM_GIZMO_WMAPI_H__ */