[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22930] branches/blender2.5/blender/ release/ui: 2.5 Buttons:

[Thomas Dinges]

Revision: 22930
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22930
Author:   dingto
Date:     2009-09-01 16:59:50 +0200 (Tue, 01 Sep 2009)

Log Message:
-----------
2.5 Buttons:

* Fix for Point Density Texture panel. "System" label was there before the pointer button showed up. (For Source Type Particle System.)

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/buttons_scene.py
    branches/blender2.5/blender/release/ui/buttons_texture.py

Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py	2009-09-01 12:41:06 UTC (rev 22929)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py	2009-09-01 14:59:50 UTC (rev 22930)
@@ -205,7 +205,6 @@
 		sub.itemR(rd, "fields_still", text="Still")
 		
 		col = split.column()
-		
 		col.itemR(rd, "edge")
 		sub = col.column()
 		sub.active = rd.edge

Modified: branches/blender2.5/blender/release/ui/buttons_texture.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_texture.py	2009-09-01 12:41:06 UTC (rev 22929)
+++ branches/blender2.5/blender/release/ui/buttons_texture.py	2009-09-01 14:59:50 UTC (rev 22930)
@@ -665,28 +665,22 @@
 		if pd.point_source == 'PARTICLE_SYSTEM':
 			col.itemL(text="Object:")
 			col.itemR(pd, "object", text="")
-			col = col.column()
-			col.enabled = pd.object
-			col.itemL(text="System:")
-			col.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
-			col.itemL(text="Cache:")
-			col.itemR(pd, "particle_cache", text="")
+			
+			sub = col.column()
+			sub.enabled = pd.object
+			if pd.object:
+				sub.itemL(text="System:")
+				sub.item_pointerR(pd, "particle_system", pd.object, "particle_systems", text="")
+			sub.itemL(text="Cache:")
+			sub.itemR(pd, "particle_cache", text="")
 		else:
 			col.itemL(text="Object:")
 			col.itemR(pd, "object", text="")
 			col.itemL(text="Cache:")
 			col.itemR(pd, "vertices_cache", text="")
 		
-		sub = split.column()
+		col.itemS()
 		
-		sub.itemL()
-		sub.itemR(pd, "radius")
-		
-		sub.itemL(text="Falloff:")
-		sub.itemR(pd, "falloff", text="")
-		if pd.falloff == 'SOFT':
-			sub.itemR(pd, "falloff_softness")
-		
 		col.itemL(text="Color Source:")	
 		col.itemR(pd, "color_source", text="")
 		if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_VELOCITY'):
@@ -694,6 +688,14 @@
 		if pd.color_source in ('PARTICLE_SPEED', 'PARTICLE_AGE'):
 			layout.template_color_ramp(pd.color_ramp, expand=True)
 
+		col = split.column()
+		col.itemL()
+		col.itemR(pd, "radius")
+		col.itemL(text="Falloff:")
+		col.itemR(pd, "falloff", text="")
+		if pd.falloff == 'SOFT':
+			col.itemR(pd, "falloff_softness")
+
 class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel):
 	__label__ = "Turbulence"