[Bf-blender-cvs] [27cdc664847] vr_scene_inspection: Fix shading options missing in 3D View popover

[Julian Eisel]

Commit: 27cdc6648470bbf06c81f818dc5f601eead45673
Author: Julian Eisel
Date:   Mon Mar 9 12:48:06 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB27cdc6648470bbf06c81f818dc5f601eead45673

Fix shading options missing in 3D View popover

Wasn't actually returning the poll() result during regular usage (i.e.
not re-used for scene or VR view shading options).

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

M	release/scripts/startup/bl_ui/space_view3d.py

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 1931337b384..fd4cf2feec8 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -5570,17 +5570,16 @@ class VIEW3D_PT_shading_options(Panel):
 
     @classmethod
     def poll(cls, context):
-        cls.poll_ex(context)
+        return cls.poll_ex(context)
 
     def draw(self, context):
-        VIEW3D_PT_shading_options.draw_ex(self, context)
+        self.draw_ex(context)
 
     @classmethod
     def poll_ex(cls, context, shading=None):
         shading = VIEW3D_PT_shading.get_shading(context, shading)
         return shading.type in {'WIREFRAME', 'SOLID'}
 
-    @staticmethod
     def draw_ex(self, context, shading=None):
         layout = self.layout