diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-23 20:46:35 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-23 20:46:35 +0400 |
| commit | 5cc898ada2fbe11e1847c385b0c0439df3a706df (patch) | |
| tree | 5b61839f273a2f4204f4cf92b291ef9e01ce7e06 /intern/cycles | |
| parent | 6c9438ea8a34054c66690a8c5d49162d0fd9379a (diff) | |
| parent | 74b4fd26d2d1dde537a46f9237839c057cd03aaf (diff) | |
svn merge ^/trunk/blender -r43616:43639
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 67ff79a2037..f44c04e36f8 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -337,16 +337,13 @@ class CyclesObject_PT_ray_visibility(CyclesButtonsPanel, Panel): ob = context.object visibility = ob.cycles_visibility - split = layout.split() - - col = split.column() - col.prop(visibility, "camera") - col.prop(visibility, "diffuse") - col.prop(visibility, "glossy") - - col = split.column() - col.prop(visibility, "transmission") - col.prop(visibility, "shadow") + flow = layout.column_flow() + + flow.prop(visibility, "camera") + flow.prop(visibility, "diffuse") + flow.prop(visibility, "glossy") + flow.prop(visibility, "transmission") + flow.prop(visibility, "shadow") def find_node(material, nodetype): @@ -473,17 +470,13 @@ class CyclesWorld_PT_settings(CyclesButtonsPanel, Panel): world = context.world cworld = world.cycles - split = layout.split() - col = split.column() + col = layout.column() col.prop(cworld, "sample_as_light") row = col.row() row.active = cworld.sample_as_light row.prop(cworld, "sample_map_resolution") - col = split.column() - col.label() - class CyclesWorld_PT_volume(CyclesButtonsPanel, Panel): bl_label = "Volume" @@ -617,14 +610,9 @@ class CyclesTexture_PT_context(CyclesButtonsPanel, Panel): col.template_ID(user, "texture", new="texture.new") if tex: - row = split.row() - row.prop(tex, "use_nodes", icon="NODETREE", text="") - row.label() - - if not tex.use_nodes: - split = layout.split(percentage=0.2) - split.label(text="Type:") - split.prop(tex, "type", text="") + split = layout.split(percentage=0.2) + split.label(text="Type:") + split.prop(tex, "type", text="") class CyclesTexture_PT_nodes(CyclesButtonsPanel, Panel): |