From c252a7c37a3b03799962dd9324fea609648761bc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 8 Aug 2018 13:30:27 +1000 Subject: UI: don't show pie menu w/ no active object Addresses T56272 --- source/blender/editors/space_view3d/view3d_buttons.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_view3d/view3d_buttons.c') diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 8fa327d8782..38fac7cb37d 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -60,6 +60,7 @@ #include "BKE_deform.h" #include "BKE_object.h" #include "BKE_object_deform.h" +#include "BKE_report.h" #include "DEG_depsgraph.h" @@ -1223,10 +1224,14 @@ void VIEW3D_OT_properties(wmOperatorType *ot) ot->flag = 0; } -static int view3d_object_mode_menu(bContext *C, wmOperator *UNUSED(op)) +static int view3d_object_mode_menu(bContext *C, wmOperator *op) { Object *ob = CTX_data_active_object(C); - if (ob && ((ob->mode & OB_MODE_EDIT) == 0) && (ELEM(ob->type, OB_ARMATURE))) { + if (ob == NULL) { + BKE_report(op->reports, RPT_WARNING, "No active object found"); + return OPERATOR_CANCELLED; + } + else if (((ob->mode & OB_MODE_EDIT) == 0) && (ELEM(ob->type, OB_ARMATURE))) { ED_object_mode_toggle(C, OB_MODE_POSE); return OPERATOR_CANCELLED; } -- cgit v1.2.3