[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60739] trunk/blender: Interface:

[Thomas Dinges]

Revision: 60739
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60739
Author:   dingto
Date:     2013-10-13 23:45:41 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Interface:
* More compact and better looking Vertex Groups panel (Particle System).
* Smaller uiLists for Cycles as well. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/release/scripts/startup/bl_ui/properties_particle.py

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-10-13 23:24:37 UTC (rev 60738)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-10-13 23:45:41 UTC (rev 60739)
@@ -324,7 +324,7 @@
         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 @@
         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="")

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_particle.py	2013-10-13 23:24:37 UTC (rev 60738)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_particle.py	2013-10-13 23:45:41 UTC (rev 60739)
@@ -1214,29 +1214,35 @@
         ob = context.object
         psys = context.particle_system
 
-        split = layout.split(percentage=0.85)
+        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')
 
-        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="")
-
         # Commented out vertex groups don't work and are still waiting for better implementation
         # row = layout.row()
         # row.prop_search(psys, "vertex_group_velocity", ob, "vertex_groups", text="Velocity")