Generic Viewport Panel for Materials

Is enabled for all render engines as workbench will be rendering
SOLID/Texture modes and uses these settings.
This commit is contained in:
2018-05-30 19:53:46 +02:00
parent 1f693aefca
commit eb0fcd4574
2 changed files with 21 additions and 26 deletions

View File

@@ -1253,31 +1253,6 @@ class CYCLES_MATERIAL_PT_settings(CyclesButtonsPanel, Panel):
col.prop(mat, "pass_index") 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): class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel):
bl_label = "Bake" bl_label = "Bake"
bl_context = "render" bl_context = "render"
@@ -1563,7 +1538,6 @@ classes = (
CYCLES_MATERIAL_PT_volume, CYCLES_MATERIAL_PT_volume,
CYCLES_MATERIAL_PT_displacement, CYCLES_MATERIAL_PT_displacement,
CYCLES_MATERIAL_PT_settings, CYCLES_MATERIAL_PT_settings,
CYCLES_MATERIAL_PT_viewport,
CYCLES_RENDER_PT_bake, CYCLES_RENDER_PT_bake,
CYCLES_RENDER_PT_debug, CYCLES_RENDER_PT_debug,
CYCLES_SCENE_PT_simplify, CYCLES_SCENE_PT_simplify,

View File

@@ -215,6 +215,25 @@ class EEVEE_MATERIAL_PT_options(MaterialButtonsPanel, Panel):
row.prop(mat, "use_sss_translucency") row.prop(mat, "use_sss_translucency")
class MATERIAL_PT_viewport(MaterialButtonsPanel, Panel):
bl_label = "Viewport"
bl_context = "material"
bl_options = {'DEFAULT_CLOSED'}
@classmethod
def poll(cls, context):
return context.material
def draw(self, context):
mat = context.material
layout = self.layout
split = layout.split()
col = split.column(align=True)
col.prop(mat, "diffuse_color")
classes = ( classes = (
MATERIAL_MT_specials, MATERIAL_MT_specials,
MATERIAL_UL_matslots, MATERIAL_UL_matslots,
@@ -223,8 +242,10 @@ classes = (
EEVEE_MATERIAL_PT_context_material, EEVEE_MATERIAL_PT_context_material,
EEVEE_MATERIAL_PT_surface, EEVEE_MATERIAL_PT_surface,
EEVEE_MATERIAL_PT_options, EEVEE_MATERIAL_PT_options,
MATERIAL_PT_viewport,
) )
if __name__ == "__main__": # only for live edit. if __name__ == "__main__": # only for live edit.
from bpy.utils import register_class from bpy.utils import register_class
for cls in classes: for cls in classes: