Skip to content

Commit

Permalink
Properties Editor - Cycles, Materialtab, Order of panels
Browse files Browse the repository at this point in the history
  • Loading branch information
ReinerBforartists committed Nov 6, 2016
1 parent 26449d9 commit 585d918
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions intern/cycles/blender/addon/ui.py
Expand Up @@ -1094,10 +1094,9 @@ def draw(self, context):
layout.prop(mat, "diffuse_color")


class CyclesMaterial_PT_volume(CyclesButtonsPanel, Panel):
bl_label = "Volume"
class CyclesMaterial_PT_displacement(CyclesButtonsPanel, Panel):
bl_label = "Displacement"
bl_context = "material"
bl_options = {'DEFAULT_CLOSED'}

@classmethod
def poll(cls, context):
Expand All @@ -1108,14 +1107,12 @@ def draw(self, context):
layout = self.layout

mat = context.material
# cmat = mat.cycles

panel_node_draw(layout, mat, 'OUTPUT_MATERIAL', 'Volume')

panel_node_draw(layout, mat, 'OUTPUT_MATERIAL', 'Displacement')

class CyclesMaterial_PT_displacement(CyclesButtonsPanel, Panel):
bl_label = "Displacement"
class CyclesMaterial_PT_volume(CyclesButtonsPanel, Panel):
bl_label = "Volume"
bl_context = "material"
bl_options = {'DEFAULT_CLOSED'}

@classmethod
def poll(cls, context):
Expand All @@ -1126,7 +1123,9 @@ def draw(self, context):
layout = self.layout

mat = context.material
panel_node_draw(layout, mat, 'OUTPUT_MATERIAL', 'Displacement')
# cmat = mat.cycles

panel_node_draw(layout, mat, 'OUTPUT_MATERIAL', 'Volume')


class CyclesMaterial_PT_settings(CyclesButtonsPanel, Panel):
Expand Down

0 comments on commit 585d918

Please sign in to comment.