[Bf-extensions-cvs] [8009a267] master: space_view3d_pie_menus/pie_modes_menu: fix for no object in scene and no object selected

[meta-androcto]

Commit: 8009a267b8bb7a5ab020bc72f36e2bfa0500e680
Author: meta-androcto
Date:   Mon Jun 17 15:22:34 2019 +1000
Branches: master
https://developer.blender.org/rBA8009a267b8bb7a5ab020bc72f36e2bfa0500e680

space_view3d_pie_menus/pie_modes_menu: fix for no object in scene and no object selected

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

M	space_view3d_pie_menus/pie_modes_menu.py

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

diff --git a/space_view3d_pie_menus/pie_modes_menu.py b/space_view3d_pie_menus/pie_modes_menu.py
index dcbf3238..a5197551 100644
--- a/space_view3d_pie_menus/pie_modes_menu.py
+++ b/space_view3d_pie_menus/pie_modes_menu.py
@@ -294,8 +294,17 @@ class PIE_MT_ObjectEditMode(Menu):
     def draw(self, context):
         layout = self.layout
         ob = context.object
+        # No Object Selected #
+        if not ob or not ob.select_get():
+            message = "No Active Object Selected" 
+            pie = layout.menu_pie()
+            pie.separator()
+            pie.separator()
+            pie.separator()
+            box = pie.box()
+            box.label(text=message, icon="INFO")
 
-        if ob and ob.type == 'MESH' and ob.mode in {'OBJECT', 'SCULPT', 'VERTEX_PAINT',
+        elif ob and ob.type == 'MESH' and ob.mode in {'OBJECT', 'SCULPT', 'VERTEX_PAINT',
                                                     'WEIGHT_PAINT', 'TEXTURE_PAINT',
                                                     'PARTICLE_EDIT', 'GPENCIL_EDIT'}:
             pie = layout.menu_pie()
@@ -453,10 +462,8 @@ class PIE_MT_ObjectEditMode(Menu):
 
 
 
-        else:
-            message = "Active Object has only Object Mode available" if ob \
-                    and ob.type in {"LIGHT", "CAMERA", "EMPTY", "SPEAKER"} else \
-                    "No active object found. Please select one first"
+        elif ob and ob.type in {"LIGHT", "CAMERA", "EMPTY", "SPEAKER"}:
+            message = "Active Object has only Object Mode available" 
             pie = layout.menu_pie()
             pie.separator()
             pie.separator()