Commit: f6367ecfb65502a1ec40c5e382800b2ac214a499
Author: Campbell Barton
Date: Fri Jul 13 12:46:10 2018 +0200
Branches: master
https://developer.blender.org/rBf6367ecfb65502a1ec40c5e382800b2ac214a499
Cleanup: operator type API, header
===================================================================
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_operator_type.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/windowmanager/WM_api.h
b/source/blender/windowmanager/WM_api.h
index 95d5a481385..2ae2a65e2c9 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -261,19 +261,6 @@ void WM_operator_type_set(struct wmOperator
*op, struct wmOperatorType *ot);
void WM_operator_stack_clear(struct wmWindowManager *wm);
void WM_operator_handlers_clear(wmWindowManager *wm, struct
wmOperatorType *ot);
-struct wmOperatorType *WM_operatortype_find(const char *idname, bool quiet);
-void WM_operatortype_iter(struct GHashIterator *ghi);
-void WM_operatortype_append(void (*opfunc)(struct wmOperatorType *));
-void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType
*, void *), void *userdata);
-void WM_operatortype_append_macro_ptr(void (*opfunc)(struct
wmOperatorType *, void *), void *userdata);
-void WM_operatortype_remove_ptr(struct wmOperatorType *ot);
-bool WM_operatortype_remove(const char *idname);
-void WM_operatortype_last_properties_clear_all(void);
-
-struct wmOperatorType *WM_operatortype_append_macro(const char *idname, const
char *name, const char *description, int flag);
-struct wmOperatorTypeMacro *WM_operatortype_macro_define(struct wmOperatorType
*ot, const char *idname);
-
-
bool WM_operator_poll (struct bContext *C, struct
wmOperatorType *ot);
bool WM_operator_poll_context(struct bContext *C, struct wmOperatorType
*ot, short context);
int WM_operator_call_ex(struct bContext *C, struct wmOperator *op,
const bool store);
@@ -367,14 +354,28 @@ void WM_operator_bl_idname(char *to, const
char *from);
void WM_operator_py_idname(char *to, const char *from);
bool WM_operator_py_idname_ok_or_report(struct ReportList *reports,
const char *classname, const char *idname);
-/* *************** uilist types ******************** */
+
+/* wm_operator_type.c */
+struct wmOperatorType *WM_operatortype_find(const char *idname, bool quiet);
+void WM_operatortype_iter(struct GHashIterator *ghi);
+void WM_operatortype_append(void (*opfunc)(struct wmOperatorType *));
+void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType *, void
*), void *userdata);
+void WM_operatortype_append_macro_ptr(void (*opfunc)(struct wmOperatorType *,
void *), void *userdata);
+void WM_operatortype_remove_ptr(struct wmOperatorType *ot);
+bool WM_operatortype_remove(const char *idname);
+void WM_operatortype_last_properties_clear_all(void);
+
+struct wmOperatorType *WM_operatortype_append_macro(const char *idname, const
char *name, const char *description, int flag);
+struct wmOperatorTypeMacro *WM_operatortype_macro_define(struct wmOperatorType
*ot, const char *idname);
+
+/* wm_uilist_type.c */
void WM_uilisttype_init(void);
struct uiListType *WM_uilisttype_find(const char *idname, bool quiet);
bool WM_uilisttype_add(struct uiListType *ult);
void WM_uilisttype_freelink(struct uiListType *ult);
void WM_uilisttype_free(void);
-/* *************** menu types ******************** */
+/* wm_menu_type.c */
void WM_menutype_init(void);
struct MenuType *WM_menutype_find(const char *idname, bool quiet);
bool WM_menutype_add(struct MenuType *mt);
diff --git a/source/blender/windowmanager/intern/wm_operator_type.c
b/source/blender/windowmanager/intern/wm_operator_type.c
index 35efdb2c4a2..62b378e0866 100644
--- a/source/blender/windowmanager/intern/wm_operator_type.c
+++ b/source/blender/windowmanager/intern/wm_operator_type.c
@@ -199,6 +199,27 @@ void wm_operatortype_free(void)
global_ops_hash = NULL;
}
+/**
+ * Remove memory of all previously executed tools.
+ */
+void WM_operatortype_last_properties_clear_all(void)
+{
+ GHashIterator iter;
+
+ for (WM_operatortype_iter(&iter);
+ (!BLI_ghashIterator_done(&iter));
+ (BLI_ghashIterator_step(&iter)))
+ {
+ wmOperatorType *ot = BLI_ghashIterator_getValue(&iter);
+
+ if (ot->last_properties) {
+ IDP_FreeProperty(ot->last_properties);
+ MEM_freeN(ot->last_properties);
+ ot->last_properties = NULL;
+ }
+ }
+}
+
/** \} */
/* -------------------------------------------------------------------- */
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index d2fb49ffd57..ffa6b0fc371 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -122,26 +122,6 @@
#define UNDOCUMENTED_OPERATOR_TIP N_("(undocumented operator)")
/* ************ operator API, exported ********** */
-/**
- * Remove memory of all previously executed tools.
- */
-void WM_operatortype_last_properties_clear_all(void)
-{
- GHashIterator iter;
-
- for (WM_operatortype_iter(&iter);
- (!BLI_ghashIterator_done(&iter));
- (BLI_ghashIterator_step(&iter)))
- {
- wmOperatorType *ot = BLI_ghashIterator_getValue(&iter);
-
- if (ot->last_properties) {
- IDP_FreeProperty(ot->last_properties);
- MEM_freeN(ot->last_properties);
- ot->last_properties = NULL;
- }
- }
-}
/* SOME_OT_op -> some.op */
void WM_operator_py_idname(char *to, const char *from)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
