[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31674] trunk/blender/release/scripts/ui/ properties_physics_fluid.py: 2.5 Fluid UI:

[Thomas Dinges]

Revision: 31674
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31674
Author:   dingto
Date:     2010-08-31 14:54:17 +0200 (Tue, 31 Aug 2010)

Log Message:
-----------
2.5 Fluid UI:
* Required memory is now shown on the Bake Operator, rather as an extra label.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_physics_fluid.py

Modified: trunk/blender/release/scripts/ui/properties_physics_fluid.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_fluid.py	2010-08-31 11:31:21 UTC (rev 31673)
+++ trunk/blender/release/scripts/ui/properties_physics_fluid.py	2010-08-31 12:54:17 UTC (rev 31674)
@@ -58,10 +58,8 @@
             split.operator("object.modifier_add", text="Add").type = 'FLUID_SIMULATION'
             split.label()
 
-            fluid = None
 
-
-        if fluid:
+        if md:
             row = layout.row()
             row.prop(fluid, "type")
             if fluid.type not in ('NONE', 'DOMAIN', 'PARTICLE'):
@@ -72,7 +70,7 @@
                 layout.active = fluid.use
 
             if fluid.type == 'DOMAIN':
-                layout.operator("fluid.bake", text="Bake Fluid Simulation", icon='MOD_FLUIDSIM')
+                layout.operator("fluid.bake", text="Bake (Req. Memory: %s)" % fluid.memory_estimate, icon='MOD_FLUIDSIM')
                 split = layout.split()
 
                 col = split.column()
@@ -82,7 +80,7 @@
                 col.prop(fluid, "render_display_mode", text="")
 
                 col = split.column()
-                col.label(text="Required Memory: " + fluid.memory_estimate)
+                col.label()
                 col.prop(fluid, "preview_resolution", text="Preview")
                 col.label(text="Viewport Display:")
                 col.prop(fluid, "viewport_display_mode", text="")