[Durian-svn] [3744] fix for error and some updates to defaults

[campbell]

Revision: 3744
          https://blenderinstitute.dyndns.org/durian-svn/?do=log&project=durian&path=/&rev=3744
Author:   campbell
Date:     2010-05-21 17:43:54 +0200 (Fri, 21 May 2010)
Log Message:
-----------
fix for error and some updates to defaults

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

Modified: pro/scripts/modules/finals_config.py
===================================================================
--- pro/scripts/modules/finals_config.py	2010-05-21 15:13:14 UTC (rev 3743)
+++ pro/scripts/modules/finals_config.py	2010-05-21 15:43:54 UTC (rev 3744)
@@ -8,6 +8,9 @@
 import bpy
 import os
 
+
+
+
 def scene_info():
     base_dir, base_name = os.path.split(bpy.data.filename)
     base_name = os.path.splitext(base_name)[0]
@@ -25,7 +28,12 @@
 
 def pointcache_dirs(point_cache):
     # cache path local: from
-    cache_dir = bpy.utils.expandpath(point_cache.id_data.library.filename) # expand //
+    lib = point_cache.id_data.library
+    if lib:
+        cache_dir = bpy.utils.expandpath(lib.filename) # expand //
+    else:
+        cache_dir = bpy.data.filename
+        
     cache_dir = os.path.normpath(cache_dir) # remove ../../
     cache_dir = os.path.splitext(cache_dir)[0] # remove .blend
     cache_base_dir, cache_base_name = os.path.split(cache_dir)
@@ -64,6 +72,8 @@
 
 
 def pointcache_generic_bake(point_cache, baked):
+    base_dir, base_name, frame_start, frame_end, object_items = scene_info()
+    
     if baked:
         point_cache.external = True
         point_cache.filepath = os.path.join(base_dir, point_cache.name)
@@ -327,7 +337,7 @@
         '''
 
 
-def setup_shaman(baked=False, sim=False, pre_roll=10):
+def setup_shaman(baked=False, sim=True, pre_roll=10):
     base_dir, base_name, frame_start, frame_end, object_items = scene_info()
 
     # ---- Sharman ---- #
@@ -371,9 +381,19 @@
     #    psys = obj.particle_systems["mo_left"]
     #    pointcache_generic_setup(psys.point_cache, frame_start, frame_end, pre_roll)
     #    psys.hair_dynamics = sim
-    
 
-def setup_dragon_baby(baked=False, sim=False, pre_roll=10):    
+
+def get_pointcache_dragon_baby_cloth(obj=None):
+    ''' called externally '''
+    if obj is None:
+        obj = bpy.data.objects["GEO-wing_sim"]
+
+    mod = obj.modifiers["Cloth"]
+
+    return obj, mod
+
+
+def setup_dragon_baby(baked=False, sim=True, pre_roll=10):    
     base_dir, base_name, frame_start, frame_end, object_items = scene_info()
 
     # ---- Dragon Baby ---- #
@@ -405,9 +425,11 @@
             mod.point_cache.frame_start = frame_start - 1
         elif base_name.startswith("04.1c"):
             mod.point_cache.frame_start = frame_start - 3
+            
+        print("WOOOOHOOOO")
 
 
-def setup_dragon_adult(baked=False, sim=False, pre_roll=10):    
+def setup_dragon_adult(baked=False, sim=True, pre_roll=10):    
     base_dir, base_name, frame_start, frame_end, object_items = scene_info()
     
     # ---- Dragon Adult ---- #