[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46025] trunk/blender/release/scripts/ startup/bl_ui/properties_physics_common.py: Point Cache: allow baking external smoke caches.

[Brecht Van Lommel]

Revision: 46025
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46025
Author:   blendix
Date:     2012-04-28 09:00:11 +0000 (Sat, 28 Apr 2012)
Log Message:
-----------
Point Cache: allow baking external smoke caches. This needs to be cleaned up
a bit, I couldn't fully understand how the External setting is supposed to
work to make further changes, but this should make it work at least.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py

Modified: trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py	2012-04-28 09:00:09 UTC (rev 46024)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_physics_common.py	2012-04-28 09:00:11 UTC (rev 46025)
@@ -94,18 +94,25 @@
     if cachetype in {'PSYS', 'HAIR', 'SMOKE'}:
         row.prop(cache, "use_external")
 
+        if cachetype == 'SMOKE':
+            row.prop(cache, "use_library_path", "Use Lib Path")
+
     if cache.use_external:
-        split = layout.split(percentage=0.80)
-        split.prop(cache, "name", text="File Name")
-        split.prop(cache, "index", text="")
+        split = layout.split(percentage=0.35)
+        col = split.column()
+        col.label(text="File Name:")
+        if cache.use_external:
+            col.label(text="File Path:")
 
-        row = layout.row()
-        row.label(text="File Path:")
-        row.prop(cache, "use_library_path", "Use Lib Path")
+        col = split.column()
+        sub = col.split(percentage=0.70, align=True)
+        sub.prop(cache, "name", text="")
+        sub.prop(cache, "index", text="")
+        col.prop(cache, "filepath", text="")
 
-        layout.prop(cache, "filepath", text="")
-
-        layout.label(text=cache.info)
+        cache_info = cache.info
+        if cache_info:
+            layout.label(text=cache_info)
     else:
         if cachetype in {'SMOKE', 'DYNAMIC_PAINT'}:
             if not bpy.data.is_saved:
@@ -117,6 +124,7 @@
         else:
             layout.prop(cache, "name", text="Cache Name")
 
+    if not cache.use_external or cachetype == 'SMOKE':
         row = layout.row(align=True)
 
         if cachetype not in {'PSYS', 'DYNAMIC_PAINT'}: