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

PyAPI: Add error when registering a 3D gizmo into a 2D gizmo group

Browse Source 
Address issue raised in T85145.
This commit is contained in:
Campbell Barton
2021-01-29 11:12:57 +11:00
parent 92b0803f35
commit b0ab4b815a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/makesrna/intern/rna_wm_gizmo.c
View File

@@ -600,6 +600,18 @@ static wmGizmo *rna_GizmoGroup_gizmo_new(wmGizmoGroup *gzgroup,
BKE_reportf(reports, RPT_ERROR, "GizmoType '%s' not known", idname); BKE_reportf(reports, RPT_ERROR, "GizmoType '%s' not known", idname);
return NULL; return NULL;
} }
if ((gzgroup->type->flag & WM_GIZMOGROUPTYPE_3D) == 0) {
/* Allow for neither callbacks to be set, while this doesn't seem like a valid use case,
* there may be rare situations where a developer wants a gizmo to be draw-only. */
if ((gzt->test_select == NULL) && (gzt->draw_select != NULL)) {
BKE_reportf(reports,
RPT_ERROR,
"GizmoType '%s' is for a 3D gizmo-group. "
"The 'draw_select' callback is set where only 'test_select' will be used.",
idname);
return NULL;
}
}
wmGizmo *gz = WM_gizmo_new_ptr(gzt, gzgroup, NULL); wmGizmo *gz = WM_gizmo_new_ptr(gzt, gzgroup, NULL);
return gz; return gz;
} }