blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

UI: don't show pie menu w/ no active object 

Addresses T56272
This commit is contained in:
Campbell Barton 2018-08-08 13:30:27 +10:00
parent 81e99bdc75
commit c252a7c37a
Notes: blender-bot 2023-02-14 10:37:50 +01:00 
Referenced by issue #56272, stuck at pie menu
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/space_view3d/view3d_buttons.c
View File

@ -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;
}