diff options
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 50 |
2 files changed, 30 insertions, 24 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 7a03df4f35a..cbf26fb8d0a 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -324,7 +324,7 @@ class CyclesRender_PT_layers(CyclesButtonsPanel, Panel): rl = rd.layers.active row = layout.row() - row.template_list("RENDERLAYER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=2) + row.template_list("RENDERLAYER_UL_renderlayers", "", rd, "layers", rd.layers, "active_index", rows=1) col = row.column(align=True) col.operator("scene.render_layer_add", icon='ZOOMIN', text="") @@ -503,7 +503,7 @@ class Cycles_PT_context_material(CyclesButtonsPanel, Panel): if ob: row = layout.row() - row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=2) + row.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=1) col = row.column(align=True) col.operator("object.material_slot_add", icon='ZOOMIN', text="") diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 2bf2795ef8a..0b4974832b8 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1214,28 +1214,34 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): ob = context.object psys = context.particle_system - split = layout.split(percentage=0.85) - - col = split.column() - col.label(text="Vertex Group:") - col.prop_search(psys, "vertex_group_density", ob, "vertex_groups", text="Density") - col.prop_search(psys, "vertex_group_length", ob, "vertex_groups", text="Length") - col.prop_search(psys, "vertex_group_clump", ob, "vertex_groups", text="Clump") - col.prop_search(psys, "vertex_group_kink", ob, "vertex_groups", text="Kink") - col.prop_search(psys, "vertex_group_roughness_1", ob, "vertex_groups", text="Roughness 1") - col.prop_search(psys, "vertex_group_roughness_2", ob, "vertex_groups", text="Roughness 2") - col.prop_search(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End") - - col = split.column() - col.label(text="Negate:") - col.alignment = 'RIGHT' - col.prop(psys, "invert_vertex_group_density", text="") - col.prop(psys, "invert_vertex_group_length", text="") - col.prop(psys, "invert_vertex_group_clump", text="") - col.prop(psys, "invert_vertex_group_kink", text="") - col.prop(psys, "invert_vertex_group_roughness_1", text="") - col.prop(psys, "invert_vertex_group_roughness_2", text="") - col.prop(psys, "invert_vertex_group_roughness_end", text="") + col = layout.column() + row = col.row(align=True) + row.prop_search(psys, "vertex_group_density", ob, "vertex_groups", text="Density") + row.prop(psys, "invert_vertex_group_density", text="", toggle=True, icon='ARROW_LEFTRIGHT') + + row = col.row(align=True) + row.prop_search(psys, "vertex_group_length", ob, "vertex_groups", text="Length") + row.prop(psys, "invert_vertex_group_length", text="", toggle=True, icon='ARROW_LEFTRIGHT') + + row = col.row(align=True) + row.prop_search(psys, "vertex_group_clump", ob, "vertex_groups", text="Clump") + row.prop(psys, "invert_vertex_group_clump", text="", toggle=True, icon='ARROW_LEFTRIGHT') + + row = col.row(align=True) + row.prop_search(psys, "vertex_group_kink", ob, "vertex_groups", text="Kink") + row.prop(psys, "invert_vertex_group_kink", text="", toggle=True, icon='ARROW_LEFTRIGHT') + + row = col.row(align=True) + row.prop_search(psys, "vertex_group_roughness_1", ob, "vertex_groups", text="Roughness 1") + row.prop(psys, "invert_vertex_group_roughness_1", text="", toggle=True, icon='ARROW_LEFTRIGHT') + + row = col.row(align=True) + row.prop_search(psys, "vertex_group_roughness_2", ob, "vertex_groups", text="Roughness 2") + row.prop(psys, "invert_vertex_group_roughness_2", text="", toggle=True, icon='ARROW_LEFTRIGHT') + + row = col.row(align=True) + row.prop_search(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End") + row.prop(psys, "invert_vertex_group_roughness_end", text="", toggle=True, icon='ARROW_LEFTRIGHT') # Commented out vertex groups don't work and are still waiting for better implementation # row = layout.row() |