blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Cleanup: clarify WM_gizmoconfig function naming

This commit is contained in:
Campbell Barton 2019-06-27 19:58:35 +10:00
parent 1c60f30d04
commit 219a10e46a
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/windowmanager/gizmo/WM_gizmo_api.h
View File

@ -159,10 +159,10 @@ struct wmGizmoGroupTypeRef *WM_gizmogrouptype_append_and_link(
/* wm_gizmo_map.c */
/* Dynamic Updates (for RNA runtime registration) */
void WM_gizmoconfig_update_tag_init(struct wmGizmoMapType *gzmap_type,
struct wmGizmoGroupType *gzgt);
void WM_gizmoconfig_update_tag_remove(struct wmGizmoMapType *gzmap_type,
struct wmGizmoGroupType *gzgt);
void WM_gizmoconfig_update_tag_group_type_init(struct wmGizmoMapType *gzmap_type,
struct wmGizmoGroupType *gzgt);
void WM_gizmoconfig_update_tag_group_type_remove(struct wmGizmoMapType *gzmap_type,
struct wmGizmoGroupType *gzgt);
void WM_gizmoconfig_update(struct Main *bmain);
/* wm_maniulator_target_props.c */

4
source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
View File

@ -970,7 +970,7 @@ void WM_gizmo_group_type_add_ptr_ex(wmGizmoGroupType *gzgt, wmGizmoMapType *gzma
{
WM_gizmomaptype_group_link_ptr(gzmap_type, gzgt);
WM_gizmoconfig_update_tag_init(gzmap_type, gzgt);
WM_gizmoconfig_update_tag_group_type_init(gzmap_type, gzgt);
}
void WM_gizmo_group_type_add_ptr(wmGizmoGroupType *gzgt)
{
@ -1050,7 +1050,7 @@ void WM_gizmo_group_type_reinit(struct Main *bmain, const char *idname)
void WM_gizmo_group_type_unlink_delayed_ptr_ex(wmGizmoGroupType *gzgt, wmGizmoMapType *gzmap_type)
{
WM_gizmoconfig_update_tag_remove(gzmap_type, gzgt);
WM_gizmoconfig_update_tag_group_type_remove(gzmap_type, gzgt);
}
void WM_gizmo_group_type_unlink_delayed_ptr(wmGizmoGroupType *gzgt)

5
source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
View File

@ -1238,7 +1238,7 @@ void wm_gizmos_keymap(wmKeyConfig *keyconf)
*
* \{ */
void WM_gizmoconfig_update_tag_init(wmGizmoMapType *gzmap_type, wmGizmoGroupType *gzgt)
void WM_gizmoconfig_update_tag_group_type_init(wmGizmoMapType *gzmap_type, wmGizmoGroupType *gzgt)
{
/* tag for update on next use */
gzmap_type->type_update_flag |= (WM_GIZMOMAPTYPE_UPDATE_INIT | WM_GIZMOMAPTYPE_KEYMAP_INIT);
@ -1247,7 +1247,8 @@ void WM_gizmoconfig_update_tag_init(wmGizmoMapType *gzmap_type, wmGizmoGroupType
wm_gzmap_type_update_flag |= WM_GIZMOMAPTYPE_GLOBAL_UPDATE_INIT;
}
void WM_gizmoconfig_update_tag_remove(wmGizmoMapType *gzmap_type, wmGizmoGroupType *gzgt)
void WM_gizmoconfig_update_tag_group_type_remove(wmGizmoMapType *gzmap_type,
wmGizmoGroupType *gzgt)
{
/* tag for update on next use */
gzmap_type->type_update_flag |= WM_GIZMOMAPTYPE_UPDATE_REMOVE;

2
source/blender/windowmanager/intern/wm_toolsystem.c
View File

@ -186,7 +186,7 @@ static void toolsystem_ref_link(bContext *C, WorkSpace *workspace, bToolRef *tre
/* Even if the group-type was has been linked, it's possible the space types
* were not previously using it. (happens with multiple windows.) */
wmGizmoMapType *gzmap_type = WM_gizmomaptype_ensure(&gzgt->gzmap_params);
WM_gizmoconfig_update_tag_init(gzmap_type, gzgt);
WM_gizmoconfig_update_tag_group_type_init(gzmap_type, gzgt);
}
}
}