[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26251] trunk/blender: Smoke:
Daniel Genrich
daniel.genrich at gmx.net
Mon Jan 25 16:24:48 CET 2010
Revision: 26251
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26251
Author: genscher
Date: 2010-01-25 16:24:48 +0100 (Mon, 25 Jan 2010)
Log Message:
-----------
Smoke:
* UI updates for my last commit by nudelZ
Modified Paths:
--------------
trunk/blender/release/scripts/ui/properties_physics_smoke.py
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
Modified: trunk/blender/release/scripts/ui/properties_physics_smoke.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_smoke.py 2010-01-25 15:10:14 UTC (rev 26250)
+++ trunk/blender/release/scripts/ui/properties_physics_smoke.py 2010-01-25 15:24:48 UTC (rev 26251)
@@ -80,13 +80,14 @@
col = split.column()
col.label(text="Resolution:")
col.prop(domain, "maxres", text="Divisions")
+ col.label(text="Particle:")
+ col.prop(domain, "initial_velocity", text="Initial Velocity")
if wide_ui:
col = split.column()
col.label(text="Behavior:")
col.prop(domain, "alpha")
col.prop(domain, "beta")
- col.prop(domain, "initial_velocity", text="Initial Velocity")
col.prop(domain, "dissolve_smoke", text="Dissolve")
sub = col.column()
sub.active = domain.dissolve_smoke
@@ -156,12 +157,13 @@
return md and (md.smoke_type == 'TYPE_DOMAIN')
def draw(self, context):
+ layout = self.layout
domain = context.smoke.domain_settings
- self.layout.prop(domain, "smoke_cache_comp")
+ layout.label(text="Compression:")
+ layout.prop(domain, "smoke_cache_comp", expand=True)
-
md = context.smoke.domain_settings
cache = md.point_cache_low
@@ -210,11 +212,12 @@
return md and (md.smoke_type == 'TYPE_DOMAIN') and md.domain_settings.highres
def draw(self, context):
+ layout = self.layout
-
domain = context.smoke.domain_settings
- self.layout.prop(domain, "smoke_cache_high_comp")
+ layout.label(text="Compression:")
+ layout.prop(domain, "smoke_cache_high_comp", expand=True)
md = context.smoke.domain_settings
Modified: trunk/blender/source/blender/makesrna/intern/rna_smoke.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_smoke.c 2010-01-25 15:10:14 UTC (rev 26250)
+++ trunk/blender/source/blender/makesrna/intern/rna_smoke.c 2010-01-25 15:24:48 UTC (rev 26251)
@@ -118,8 +118,8 @@
{0, NULL, 0, NULL, NULL}};
static EnumPropertyItem smoke_cache_comp_items[] = {
- {SM_CACHE_HEAVY, "CACHEHEAVY", 0, "Heavy (Very slow)", "Effective but slow compression."},
- {SM_CACHE_LIGHT, "CACHELIGHT", 0, "Light (Fast)", "Fast but not so effective compression."},
+ {SM_CACHE_LIGHT, "CACHELIGHT", 0, "Light", "Fast but not so effective compression."},
+ {SM_CACHE_HEAVY, "CACHEHEAVY", 0, "Heavy", "Effective but slow compression."},
{0, NULL, 0, NULL, NULL}};
srna = RNA_def_struct(brna, "SmokeDomainSettings", NULL);
More information about the Bf-blender-cvs
mailing list