Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-05-30 20:53:46 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-05-30 20:57:51 +0300
commiteb0fcd4574aaac732045058dce71a17f6900384c (patch)
tree9ffde9d78dae0bb6588f45a459307389ef09877f /intern
parent1f693aefca052918d308082f752f388d487f39b6 (diff)
Generic Viewport Panel for Materials
Is enabled for all render engines as workbench will be rendering SOLID/Texture modes and uses these settings.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/blender/addon/ui.py26
1 files changed, 0 insertions, 26 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index 0d9c6166566..032b3e9573d 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -1253,31 +1253,6 @@ class CYCLES_MATERIAL_PT_settings(CyclesButtonsPanel, Panel):
col.prop(mat, "pass_index")
-class CYCLES_MATERIAL_PT_viewport(CyclesButtonsPanel, Panel):
- bl_label = "Viewport"
- bl_context = "material"
- bl_options = {'DEFAULT_CLOSED'}
-
- @classmethod
- def poll(cls, context):
- return context.material and CyclesButtonsPanel.poll(context)
-
- def draw(self, context):
- mat = context.material
-
- layout = self.layout
- split = layout.split()
-
- col = split.column(align=True)
- col.label("Color:")
- col.prop(mat, "diffuse_color", text="")
- col.prop(mat, "alpha")
-
- col = split.column(align=True)
- col.label("Specular:")
- col.prop(mat, "specular_color", text="")
-
-
class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel):
bl_label = "Bake"
bl_context = "render"
@@ -1563,7 +1538,6 @@ classes = (
CYCLES_MATERIAL_PT_volume,
CYCLES_MATERIAL_PT_displacement,
CYCLES_MATERIAL_PT_settings,
- CYCLES_MATERIAL_PT_viewport,
CYCLES_RENDER_PT_bake,
CYCLES_RENDER_PT_debug,
CYCLES_SCENE_PT_simplify,