[Bf-blender-cvs] [e3e370c5ead] vr_scene_inspection: Fix render settings not showing up for workbench engine

[Julian Eisel]

Commit: e3e370c5ead3643896a6da12c7724371300c3268
Author: Julian Eisel
Date:   Tue Jan 28 11:48:56 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rBe3e370c5ead3643896a6da12c7724371300c3268

Fix render settings not showing up for workbench engine

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

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

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

diff --git a/release/scripts/addons b/release/scripts/addons
index 1e165b809b6..12686a856db 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1e165b809b66fbf19778dbb6f1a3f4e64efef031
+Subproject commit 12686a856dbf99fdf4b1eac6de915b7edbec587c
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index b4c864c16cd..1d6c3902871 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -20,6 +20,7 @@
 # <pep8 compliant>
 from bpy.types import Panel
 from bl_ui.space_view3d import (
+    VIEW3D_PT_shading,
     VIEW3D_PT_shading_lighting,
     VIEW3D_PT_shading_color,
     VIEW3D_PT_shading_options,
@@ -580,7 +581,8 @@ class RENDER_PT_opengl_color(RenderButtonsPanel, Panel):
         return (context.engine in cls.COMPAT_ENGINES)
 
     def draw(self, context):
-        VIEW3D_PT_shading_color._draw_color_type(self, context)
+        shading = VIEW3D_PT_shading.get_shading(context)
+        VIEW3D_PT_shading_color._draw_color_type(self.layout, shading)
 
 
 class RENDER_PT_opengl_options(RenderButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 59ef5579c2c..efcde9aed06 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -5301,7 +5301,7 @@ class VIEW3D_PT_shading_lighting(Panel):
         return cls.poll_ex(context)
 
     def draw(self, context):
-        self.draw_ex(context)
+        VIEW3D_PT_shading_lighting.draw_ex(self, context)
 
     @classmethod
     def poll_ex(cls, context, opt_shading=None):
@@ -5309,6 +5309,7 @@ class VIEW3D_PT_shading_lighting(Panel):
         engine = context.scene.render.engine
         return shading.type in {'SOLID', 'MATERIAL'} or engine == 'BLENDER_EEVEE' and shading.type == 'RENDERED'
 
+    @staticmethod
     def draw_ex(self, context, opt_shading=None):
         layout = self.layout
         shading = VIEW3D_PT_shading.get_shading(context, opt_shading)
@@ -5461,13 +5462,14 @@ class VIEW3D_PT_shading_options(Panel):
         cls.poll_ex(context)
 
     def draw(self, context):
-        self.draw_ex(context)
+        VIEW3D_PT_shading_options.draw_ex(self, 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