[Bf-blender-cvs] [0b458e83221] master: Cleanup: Create/use types for generic WM callbacks
Julian Eisel
noreply at git.blender.org
Wed Apr 21 15:18:11 CEST 2021
Commit: 0b458e832218d0c9309ffef9ac90c1539970e55b
Author: Julian Eisel
Date: Wed Apr 21 15:01:18 2021 +0200
Branches: master
https://developer.blender.org/rB0b458e832218d0c9309ffef9ac90c1539970e55b
Cleanup: Create/use types for generic WM callbacks
Makes it less of a hassle to pass these callbacks around as function
arguments, and deduplicates their signature when doing so.
===================================================================
M source/blender/windowmanager/WM_types.h
===================================================================
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h
index d54925272de..1d99b605205 100644
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@ -132,17 +132,21 @@ struct wmWindowManager;
extern "C" {
#endif
+typedef void (*wmGenericUserDataFreeFn)(void *data);
+
typedef struct wmGenericUserData {
void *data;
/** When NULL, use #MEM_freeN. */
- void (*free_fn)(void *data);
+ wmGenericUserDataFreeFn free_fn;
bool use_free;
} wmGenericUserData;
+typedef void (*wmGenericCallbackFn)(struct bContext *C, void *user_data);
+
typedef struct wmGenericCallback {
- void (*exec)(struct bContext *C, void *user_data);
+ wmGenericCallbackFn exec;
void *user_data;
- void (*free_user_data)(void *user_data);
+ wmGenericUserDataFreeFn free_user_data;
} wmGenericCallback;
/* ************** wmOperatorType ************************ */
More information about the Bf-blender-cvs
mailing list