[Durian-svn] [3706]

[campbell]

Revision: 3706
          https://blenderinstitute.dyndns.org/durian-svn/?do=log&project=durian&path=/&rev=3706
Author:   campbell
Date:     2010-05-21 12:26:07 +0200 (Fri, 21 May 2010)
Log Message:
-----------

fixes to last commit

Modified Paths:
--------------
    pro/scripts/modules/finals_config.py

Modified: pro/scripts/modules/finals_config.py
===================================================================
--- pro/scripts/modules/finals_config.py	2010-05-21 10:10:21 UTC (rev 3705)
+++ pro/scripts/modules/finals_config.py	2010-05-21 10:26:07 UTC (rev 3706)
@@ -63,7 +63,7 @@
     point_cache.disk_cache = True
 
 
-def pointcache_generic_bake(point_cache):
+def pointcache_generic_bake(point_cache, baked):
     if baked:
         point_cache.external = True
         point_cache.filepath = os.path.join(base_dir, point_cache.name)
@@ -88,11 +88,9 @@
     return obj, psys
 
 
-
-
-
 # --- setup sintel/dragon/adult
 
+
 def setup_sintel(baked=False, sim=True, pre_roll=40, collisions=False, mindis=0.002):
 
     base_dir, base_name, frame_start, frame_end, object_items = scene_info()
@@ -111,7 +109,7 @@
             # change per scene
             pointcache_generic_setup(psys.point_cache, frame_start, frame_end, pre_roll)
             psys.point_cache.name = "sintel_hair_" + base_name
-            pointcache_generic_bake(psys.point_cache)
+            pointcache_generic_bake(psys.point_cache, baked)
 
 
     # obj = bpy.data.objects.get("GEO-sintel_hair_emit")
@@ -123,7 +121,7 @@
         # change per scene
         pointcache_generic_setup(psys.point_cache, frame_start, frame_end, pre_roll)
         psys.point_cache.name = "sintel_hair_" + base_name
-        pointcache_generic_bake(psys.point_cache)
+        pointcache_generic_bake(psys.point_cache, baked)
 
         # static settings
         psys.hair_dynamics = sim
@@ -148,7 +146,7 @@
             collider.collision.outer_thickness = collider.collision.inner_thickness = mindis
         else:
             coll.enable_collision = coll.enable_self_collision = False
-        
+
         def load_hair_weights(name):
             path = base_dir + os.sep + name
 
@@ -342,7 +340,7 @@
             cloth_mod.realtime = True
         pointcache_generic_setup(cloth_mod.point_cache, frame_start, frame_end, pre_roll)
         cloth_mod.point_cache.name = "shaman_cloth_" + base_name
-        pointcache_generic_bake(cloth_mod.point_cache)
+        pointcache_generic_bake(cloth_mod.point_cache, baked)
         
         cloth_mod.collision_settings.collision_quality = 2
         cloth_mod.settings.pre_roll = 0
@@ -398,7 +396,7 @@
 
         pointcache_generic_setup(mod.point_cache, frame_start, frame_end, pre_roll)
         mod.point_cache.name = "dragon_baby_" + base_name
-        pointcache_generic_bake(mod.point_cache)
+        pointcache_generic_bake(mod.point_cache, baked)
 
         # Per-blend dragon baby stuff...
         if base_name.startswith("03.1g"):
@@ -433,7 +431,7 @@
             mod.render = True
         pointcache_generic_setup(mod.point_cache, frame_start, frame_end, pre_roll)
         mod.point_cache.name = "dragon_adult_" + base_name
-        pointcache_generic_bake(mod.point_cache)
+        pointcache_generic_bake(mod.point_cache, baked)
 
         # Per-blend dragon baby stuff...
         #if base_name.startswith("03.1g"):