Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T58474: Gizmo Operator template fails on rerun

Browse Source
This commit is contained in:
Campbell Barton
2018-12-04 10:15:02 +11:00
parent 2c19c9b2f6
commit c631782542
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/templates_py/gizmo_operator.py
View File

@@ -68,7 +68,7 @@ class SelectSideOfPlane(Operator):
if context.space_data.type == 'VIEW_3D': if context.space_data.type == 'VIEW_3D':
wm = context.window_manager wm = context.window_manager
wm.gizmo_group_type_add(SelectSideOfPlaneGizmoGroup.bl_idname) wm.gizmo_group_type_ensure(SelectSideOfPlaneGizmoGroup.bl_idname)
return {'FINISHED'} return {'FINISHED'}
@@ -106,7 +106,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
op = cls.my_target_operator(context) op = cls.my_target_operator(context)
if op is None: if op is None:
wm = context.window_manager wm = context.window_manager
wm.gizmo_group_type_remove(SelectSideOfPlaneGizmoGroup.bl_idname) wm.gizmo_group_type_unlink_delayed(SelectSideOfPlaneGizmoGroup.bl_idname)
return False return False
return True return True

16
source/blender/makesrna/intern/rna_wm_api.c
View File

@@ -138,19 +138,19 @@ static wmGizmoGroupType *wm_gizmogrouptype_find_for_add_remove(ReportList *repor
return gzgt; return gzgt;
} }
static void rna_gizmo_group_type_add(ReportList *reports, const char *idname) static void rna_gizmo_group_type_ensure(ReportList *reports, const char *idname)
{ {
wmGizmoGroupType *gzgt = wm_gizmogrouptype_find_for_add_remove(reports, idname); wmGizmoGroupType *gzgt = wm_gizmogrouptype_find_for_add_remove(reports, idname);
if (gzgt != NULL) { if (gzgt != NULL) {
WM_gizmo_group_type_add_ptr(gzgt); WM_gizmo_group_type_ensure_ptr(gzgt);
} }
} }
static void rna_gizmo_group_type_remove(Main *bmain, ReportList *reports, const char *idname) static void rna_gizmo_group_type_unlink_delayed(ReportList *reports, const char *idname)
{ {
wmGizmoGroupType *gzgt = wm_gizmogrouptype_find_for_add_remove(reports, idname); wmGizmoGroupType *gzgt = wm_gizmogrouptype_find_for_add_remove(reports, idname);
if (gzgt != NULL) { if (gzgt != NULL) {
WM_gizmo_group_type_remove_ptr(bmain, gzgt); WM_gizmo_group_type_unlink_delayed_ptr(gzgt);
} }
} }
@@ -549,15 +549,15 @@ void RNA_api_wm(StructRNA *srna)
parm = RNA_def_pointer(func, "timer", "Timer", "", ""); parm = RNA_def_pointer(func, "timer", "Timer", "", "");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED);
func = RNA_def_function(srna, "gizmo_group_type_add", "rna_gizmo_group_type_add"); func = RNA_def_function(srna, "gizmo_group_type_ensure", "rna_gizmo_group_type_ensure");
RNA_def_function_ui_description(func, "Activate an existing widget group (when the persistent option isn't set)"); RNA_def_function_ui_description(func, "Activate an existing widget group (when the persistent option isn't set)");
RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_REPORTS); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_REPORTS);
parm = RNA_def_string(func, "identifier", NULL, 0, "", "Gizmo group type name"); parm = RNA_def_string(func, "identifier", NULL, 0, "", "Gizmo group type name");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
func = RNA_def_function(srna, "gizmo_group_type_remove", "rna_gizmo_group_type_remove"); func = RNA_def_function(srna, "gizmo_group_type_unlink_delayed", "rna_gizmo_group_type_unlink_delayed");
RNA_def_function_ui_description(func, "De-activate a widget group (when the persistent option isn't set)"); RNA_def_function_ui_description(func, "Unlink a widget group (when the persistent option is set)");
RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_MAIN | FUNC_USE_REPORTS); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_REPORTS);
parm = RNA_def_string(func, "identifier", NULL, 0, "", "Gizmo group type name"); parm = RNA_def_string(func, "identifier", NULL, 0, "", "Gizmo group type name");
RNA_def_parameter_flags(parm, 0, PARM_REQUIRED); RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);