[Durian-svn] [4445] filename -> filepath
campbell
institute at blender.org
Thu Jun 3 16:36:59 CEST 2010
Revision: 4445
https://blenderinstitute.dyndns.org/durian-svn/?do=log&project=durian&path=/&rev=4445
Author: campbell
Date: 2010-06-03 16:36:59 +0200 (Thu, 03 Jun 2010)
Log Message:
-----------
filename -> filepath
Modified Paths:
--------------
pro/scripts/io/hair_weight_export.py
pro/scripts/modules/finals_config.py
pro/scripts/op/marker_camera_namer.py
pro/scripts/op/marker_render.py
pro/scripts/op/object_library_load.py
pro/scripts/utilities/batch_bake.py
pro/scripts/utilities/batch_ogl.py
pro/scripts/utilities/findLibError.py
pro/scripts/utilities/findPathError.py
Modified: pro/scripts/io/hair_weight_export.py
===================================================================
--- pro/scripts/io/hair_weight_export.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/io/hair_weight_export.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -53,7 +53,7 @@
return {'RUNNING_MODAL'}
def menu_func(self, context):
- default_path = bpy.data.filename.replace(".blend", ".hairw")
+ default_path = bpy.data.filepath.replace(".blend", ".hairw")
self.layout.operator(ExportHairWeights.bl_idname, text="Particle Hair Weigts (.hairw)").path = default_path
def register():
Modified: pro/scripts/modules/finals_config.py
===================================================================
--- pro/scripts/modules/finals_config.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/modules/finals_config.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -11,11 +11,11 @@
import bpy
import os
+GLOBAL_QUALITY = 10
-
def scene_info():
- base_dir, base_name = os.path.split(bpy.data.filename)
+ base_dir, base_name = os.path.split(bpy.data.filepath)
base_name = os.path.splitext(base_name)[0]
if base_name.endswith("_comp"):
@@ -33,9 +33,9 @@
# cache path local: from
lib = point_cache.id_data.library
if lib:
- cache_dir = bpy.utils.expandpath(lib.filename) # expand //
+ cache_dir = bpy.utils.expandpath(lib.filepath) # expand //
else:
- cache_dir = bpy.data.filename
+ cache_dir = bpy.data.filepath
cache_dir = os.path.normpath(cache_dir) # remove ../../
cache_dir = os.path.splitext(cache_dir)[0] # remove .blend
@@ -43,7 +43,7 @@
cache_path_from = os.path.join(cache_base_dir, "blendcache_" + cache_base_name)
# cache path global: to
- base_dir, base_name = os.path.split(bpy.data.filename)
+ base_dir, base_name = os.path.split(bpy.data.filepath)
cache_path_to = os.path.join(base_dir, point_cache.name, point_cache.name)
point_cache.use_library_path = True
@@ -142,7 +142,6 @@
psys.hair_dynamics = sim
psys.cloth.settings.pin_stiffness = 0.2
- psys.cloth.settings.quality = 20
psys.cloth.settings.pre_roll = pre_roll # this is very important
psys.settings.child_nbr = 40
@@ -998,10 +997,10 @@
import os
def blend_path_list(path):
- for dirpath, dirnames, filenames in os.walk(path):
- for filename in filenames:
- if filename.endswith(".blend"):
- yield filename
+ for dirpath, dirnames, filepaths in os.walk(path):
+ for filepath in filepaths:
+ if filepath.endswith(".blend"):
+ yield filepath
blends = list(blend_path_list("/d/pro/scenes"))
@@ -1043,7 +1042,7 @@
sintal_preset_hair_func()
# override
- psys.cloth.settings.quality = 80
+ psys.cloth.settings.quality = GLOBAL_QUALITY
def get_pointcache_shaman_cloth(obj=None):
@@ -1147,7 +1146,7 @@
elif base_name.startswith("04.1c"):
mod.point_cache.frame_start = frame_start - 3
- mod.settings.quality = 80
+ mod.settings.quality = GLOBAL_QUALITY
def get_pointcache_dragon_adult_cloth(obj=None):
@@ -1190,7 +1189,7 @@
#if base_name.startswith("03.1g"):
mod.point_cache.frame_start = frame_start - pre_roll
- mod.settings.quality = 80
+ mod.settings.quality = GLOBAL_QUALITY
def setup_guardian(baked=False, sim=False, pre_roll=10):
Modified: pro/scripts/op/marker_camera_namer.py
===================================================================
--- pro/scripts/op/marker_camera_namer.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/op/marker_camera_namer.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -8,7 +8,7 @@
def execute(self, context):
import os
names = {}
- name = os.path.basename(bpy.data.filename)
+ name = os.path.basename(bpy.data.filepath)
name = name.split("_")[0]
markers = []
Modified: pro/scripts/op/marker_render.py
===================================================================
--- pro/scripts/op/marker_render.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/op/marker_render.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -11,7 +11,7 @@
frame_end = scene.frame_end
rd.use_file_extension = False
- output_path += bpy.data.filename.split("\\")[-1].split("/")[-1].replace(".blend", "")
+ output_path += bpy.data.filepath.split("\\")[-1].split("/")[-1].replace(".blend", "")
switch = [(m.frame, m, m.camera) for m in scene.timeline_markers if m.camera and m.camera.restrict_render == False]
switch.sort()
Modified: pro/scripts/op/object_library_load.py
===================================================================
--- pro/scripts/op/object_library_load.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/op/object_library_load.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -77,7 +77,7 @@
self.report({'WARNING'}, "Empty is not a DupliGroup instance")
return
- filename = getattr(group.library, "filename", None)
+ filename = getattr(group.library, "filepath", None)
if filename is None:
self.report({'WARNING'}, "DupiGroup isnt linked")
return
@@ -87,7 +87,7 @@
else:
obdata = obj.data
- filename = getattr(obdata.library, "filename", None)
+ filename = getattr(obdata.library, "filepath", None)
if filename is None:
self.report({'WARNING'}, "ObData isnt linked")
return
Modified: pro/scripts/utilities/batch_bake.py
===================================================================
--- pro/scripts/utilities/batch_bake.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/utilities/batch_bake.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -24,6 +24,7 @@
BIN = "/shared/bin/blender_farm.sh"
RENDER_DIR = "/shared/sim/%s/" % str(preset)
+GLOBAL_PRE_ROLL = 10 # keep at 40
MULTIPROCESS = False
@@ -213,11 +214,11 @@
print("layers:", lay)
- setup_sim_func(baked=False, pre_roll=40) # <--- why is this needed?
+ setup_sim_func(baked=False, pre_roll=GLOBAL_PRE_ROLL) # <--- why is this needed?
bpy.ops.ptcache.free_bake(context)
if OVERRIDE:
- setup_sim_func(baked=False, pre_roll=40)
+ setup_sim_func(baked=False, pre_roll=GLOBAL_PRE_ROLL)
else:
reload(durian_init) # <--- why is this needed?
@@ -252,7 +253,7 @@
text_replace(init_script, "sim=False", "sim=True")
# save so on open this renders quick
- bpy.ops.wm.save_mainfile(check_existing=False, path=bpy.data.filename)
+ bpy.ops.wm.save_mainfile(check_existing=False, path=bpy.data.filepath)
def blender_fg_render():
@@ -266,8 +267,8 @@
bpy.context.scene.render.file_format = 'AVI_JPEG'
bpy.context.scene.render.file_quality = 95
- filename = bpy.data.filename.replace(".blend", ".avi")
- bpy.context.scene.render.output_path = os.path.join(RENDER_DIR, os.path.basename(filename))
+ filepath = bpy.data.filepath.replace(".blend", ".avi")
+ bpy.context.scene.render.output_path = os.path.join(RENDER_DIR, os.path.basename(filepath))
if OVERRIDE:
finals_config_setup_all(baked=True)
Modified: pro/scripts/utilities/batch_ogl.py
===================================================================
--- pro/scripts/utilities/batch_ogl.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/utilities/batch_ogl.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -80,7 +80,7 @@
rd.stamp_marker = True
rd.stamp_note = True
- rd.stamp_note_text = get_svn_info(bpy.data.filename)
+ rd.stamp_note_text = get_svn_info(bpy.data.filepath)
rd.stamp_font_size = 18
rd.stamp_foreground = 1.0, 1.0, 1.0, 1.0
@@ -97,7 +97,7 @@
scene = bpy.context.scene
if not scene.camera:
- print("Skipping '%s', no camera" % bpy.data.filename)
+ print("Skipping '%s', no camera" % bpy.data.filepath)
sys.exit()
scene.render.resolution_percentage = 100
@@ -106,7 +106,7 @@
scene.render.file_format = 'AVI_JPEG'
scene.render.file_quality = 90
- filename = bpy.data.filename.replace(".blend", ".avi")
+ filename = bpy.data.filepath.replace(".blend", ".avi")
bpy.context.scene.render.output_path = os.path.join(ANIM_DIR, os.path.basename(filename))
# hey, lets make sintel pretty
Modified: pro/scripts/utilities/findLibError.py
===================================================================
--- pro/scripts/utilities/findLibError.py 2010-06-03 14:34:27 UTC (rev 4444)
+++ pro/scripts/utilities/findLibError.py 2010-06-03 14:36:59 UTC (rev 4445)
@@ -47,7 +47,7 @@
# 01_snowbandits, 02_shaman (needs help from soenke), 03.1_alley, 04.1_ziggurat, 04.2_tornaway (just D to do), 04.3_citywall, 05.1_questbegins, 05.2_bamboo, 05.3_mountains, 05.4_foggyrocks, 05.5_desert
# 05.6_mantisfight, 05.7_cliffside, 05.8_ambushfight, 07.1_volcano, 07.2_intothecave, 08.1_dragonslair, 08.2_thebigfight, 08.4_realization, 09.1_sinkingin
-search = '/media/data/durian/pro/env_city/'
+search = '/media/data/durian/pro/scenes/'
# blender_bin = '/render/blender_$(whoami)/blender/blender'
blender_cmd = '/media/data/blender_%s/blender/blender' % os.environ["USER"]
@@ -56,15 +56,22 @@
DEBUG = True
def blend_path_list(path):
- for dirpath, dirnames, filenames in os.walk(path):
- for filename in filenames:
- if filename.endswith(".blend"):
- yield os.path.join(dirpath, filename)
+ for dirpath, dirnames, filenames in os.walk(path):
+ for filename in filenames:
+ if filename.endswith(".blend"):
+ if not (filename.endswith("_comp.blend") or "_layout" in filename):
+ if filename.startswith("0"):
+ yield os.path.join(dirpath, filename)
def main():
file_blends = list(blend_path_list(search))
file_blends.sort()
+ out = open(outfile, 'w')
+ out.write("\n")
+ out.close()
+
+
errors = {}
error_count = 0
error_total = 0
@@ -75,7 +82,7 @@
line = line.strip()
#os.system('export ')
-
+
error_count = 0
@@ -114,20 +121,23 @@
if VERBOSE:
print 'Loaded', line, str(int( (float(i)/tot) * 100.0 )) + '% done, errors:', error_count, "\n\n"
@@ Diff output truncated at 10240 characters. @@
More information about the Durian-svn
mailing list