Commit: 219a10e46aa65c6c416b205cd7389d3ee86777f6 Author: Campbell Barton Date: Thu Jun 27 19:58:35 2019 +1000 Branches: master https://developer.blender.org/rB219a10e46aa65c6c416b205cd7389d3ee86777f6
Cleanup: clarify WM_gizmoconfig function naming =================================================================== M source/blender/windowmanager/gizmo/WM_gizmo_api.h M source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c M source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c M source/blender/windowmanager/intern/wm_toolsystem.c =================================================================== diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h index 5bf18a01af5..5025291a746 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h +++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h @@ -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 */ diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index 593a2c97df4..2ec0e4e7ec3 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -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) diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index beb2707d94d..edf376b1259 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -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; diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index 3d22981f7ba..330ef2944ad 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -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); } } } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs