kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

WM: add WM_manipulatorgrouptype_append_ptr

Browse Source 
Needed for PyAPI registration.
This commit is contained in:
Campbell Barton 2017-06-05 18:10:52 +10:00
parent 0d428c674a
commit cb4f7594a0
2 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/windowmanager/manipulators/WM_manipulator_api.h
View File

@ -78,9 +78,18 @@ void WM_manipulator_set_colors(struct wmManipulator *manipulator, const float co
struct wmManipulatorGroupType *WM_manipulatorgrouptype_append(
struct wmManipulatorMapType *mmaptype,
void (*mgrouptype_func)(struct wmManipulatorGroupType *));
struct wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr(
struct wmManipulatorMapType *mmaptype,
void (*mgrouptype_func)(struct wmManipulatorGroupType *, void *),
void *userdata);
struct wmManipulatorGroupType *WM_manipulatorgrouptype_append_runtime(
const struct Main *main, struct wmManipulatorMapType *mmaptype,
void (*mgrouptype_func)(struct wmManipulatorGroupType *));
struct wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr_runtime(
const struct Main *main, struct wmManipulatorMapType *mmaptype,
void (*mgrouptype_func)(struct wmManipulatorGroupType *, void *),
void *userdata);
void WM_manipulatorgrouptype_init_runtime(
const struct Main *bmain, struct wmManipulatorMapType *mmaptype,
struct wmManipulatorGroupType *mgrouptype);

47
source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
View File

@ -484,15 +484,14 @@ wmKeyMap *WM_manipulatorgroup_keymap_common_sel(const struct wmManipulatorGroupT
*
* \{ */
/**
* Use this for registering manipulators on startup. For runtime, use #WM_manipulatorgrouptype_append_runtime.
*/
wmManipulatorGroupType *WM_manipulatorgrouptype_append(
wmManipulatorMapType *mmaptype, void (*mgrouptype_func)(wmManipulatorGroupType *))
static wmManipulatorGroupType *wm_manipulatorgrouptype_append__begin(void)
{
wmManipulatorGroupType *mgrouptype = MEM_callocN(sizeof(wmManipulatorGroupType), "manipulator-group");
mgrouptype_func(mgrouptype);
return mgrouptype;
}
static void wm_manipulatorgrouptype_append__end(
wmManipulatorMapType *mmaptype, wmManipulatorGroupType *mgrouptype)
{
mgrouptype->spaceid = mmaptype->spaceid;
mgrouptype->regionid = mmaptype->regionid;
BLI_strncpy(mgrouptype->mapidname, mmaptype->idname, MAX_NAME);
@ -503,6 +502,27 @@ wmManipulatorGroupType *WM_manipulatorgrouptype_append(
/* add the type for future created areas of the same type */
BLI_addtail(&mmaptype->manipulator_grouptypes, mgrouptype);
}
/**
* Use this for registering manipulators on startup. For runtime, use #WM_manipulatorgrouptype_append_runtime.
*/
wmManipulatorGroupType *WM_manipulatorgrouptype_append(
wmManipulatorMapType *mmaptype, void (*mgrouptype_func)(wmManipulatorGroupType *))
{
wmManipulatorGroupType *mgrouptype = wm_manipulatorgrouptype_append__begin();
mgrouptype_func(mgrouptype);
wm_manipulatorgrouptype_append__end(mmaptype, mgrouptype);
return mgrouptype;
}
wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr(
wmManipulatorMapType *mmaptype, void (*mgrouptype_func)(wmManipulatorGroupType *, void *),
void *userdata)
{
wmManipulatorGroupType *mgrouptype = wm_manipulatorgrouptype_append__begin();
mgrouptype_func(mgrouptype, userdata);
wm_manipulatorgrouptype_append__end(mmaptype, mgrouptype);
return mgrouptype;
}
@ -521,6 +541,19 @@ wmManipulatorGroupType *WM_manipulatorgrouptype_append_runtime(
return mgrouptype;
}
wmManipulatorGroupType *WM_manipulatorgrouptype_append_ptr_runtime(
const Main *main, wmManipulatorMapType *mmaptype,
void (*mgrouptype_func)(wmManipulatorGroupType *, void *),
void *userdata)
{
wmManipulatorGroupType *mgrouptype = WM_manipulatorgrouptype_append_ptr(mmaptype, mgrouptype_func, userdata);
/* Main is missing on startup when we create new areas.
* So this is only called for manipulators initialized on runtime */
WM_manipulatorgrouptype_init_runtime(main, mmaptype, mgrouptype);
return mgrouptype;
}
void WM_manipulatorgrouptype_init_runtime(
const Main *bmain, wmManipulatorMapType *mmaptype,