[Bf-blender-cvs] [a7249636409] blender2.8: Fix object mode menu crashing w/o active object

[Campbell Barton]

Commit: a7249636409a9371599d93760cff2d1a37da32ad
Author: Campbell Barton
Date:   Mon Jul 9 13:38:10 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa7249636409a9371599d93760cff2d1a37da32ad

Fix object mode menu crashing w/o active object

===================================================================

M	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 bcf9a7c4ad1..8fa327d8782 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -1226,7 +1226,7 @@ void VIEW3D_OT_properties(wmOperatorType *ot)
 static int view3d_object_mode_menu(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = CTX_data_active_object(C);
-	if (ob->type == OB_ARMATURE) {
+	if (ob && ((ob->mode & OB_MODE_EDIT) == 0) && (ELEM(ob->type, OB_ARMATURE))) {
 		ED_object_mode_toggle(C, OB_MODE_POSE);
 		return OPERATOR_CANCELLED;
 	}