Smoke:
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 25 Jan 2010 15:24:48 +0000 (15:24 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 25 Jan 2010 15:24:48 +0000 (15:24 +0000)
* UI updates for my last commit by nudelZ

release/scripts/ui/properties_physics_smoke.py
source/blender/makesrna/intern/rna_smoke.c

index b7ad29ba80a97124e7d20e8f544574134c6b6579..2fd1617316a408fc12bca0324cbf865699a64ddd 100644 (file)
@@ -80,13 +80,14 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel):
                 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,11 +157,12 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel):
         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 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
         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
index c72bf24e3c8121235d2551d77f3aa9820060003e..da77a659b7c475f65042f77beba1b928f73a8701 100644 (file)
@@ -118,8 +118,8 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna)
                                {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);