Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2009-09-01 18:59:50 +0400
committerThomas Dinges <blender@dingto.org>2009-09-01 18:59:50 +0400
commitadd244bca8259e171155be6917307136fcb8e2c8 (patch)
tree16b258fe5dcd679e5b82fa46d1f1f6f26a2cd822 /release
parent9965e8915d9121fae88aaa98990f714b3c2670bf (diff)
2.5 Buttons:
* Fix for Point Density Texture panel. "System" label was there before the pointer button showed up. (For Source Type Particle System.)
Diffstat (limited to 'release')
-rw-r--r--release/ui/buttons_scene.py1
-rw-r--r--release/ui/buttons_texture.py32
2 files changed, 17 insertions, 16 deletions
diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py
index d8b2b51751b..3c321f11f6e 100644
--- a/release/ui/buttons_scene.py
+++ b/release/ui/buttons_scene.py
@@ -205,7 +205,6 @@ class SCENE_PT_post_processing(RenderButtonsPanel):
sub.itemR(rd, "fields_still", text="Still")
col = split.column()
-
col.itemR(rd, "edge")
sub = col.column()
sub.active = rd.edge
diff --git a/release/ui/buttons_texture.py b/release/ui/buttons_texture.py
index ee3f85e15ef..90ce40b4832 100644
--- a/release/ui/buttons_texture.py
+++ b/release/ui/buttons_texture.py
@@ -665,27 +665,21 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
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()
-
- 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.itemS()
col.itemL(text="Color Source:")
col.itemR(pd, "color_source", text="")
@@ -694,6 +688,14 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel):
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"