diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-06 05:40:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-06 05:40:54 +0400 |
commit | 30d180ff0d18217ed860afb3f63a38d536b41790 (patch) | |
tree | 9602181a42d3ce2a50d25e4ce84be5cb6b42e313 /release/scripts/io/netrender | |
parent | 46d88bb8037f58220aae2397cb893ff1726aa94f (diff) |
bugfix [#23194] export UVs miss the extension file
also made all other exporters do this.
Made some internal changes.
- moved path functions from bpy.utils to bpy.path (similar to os.path)
- added functions...
bpy.path.ensure_ext(path, ".ext", case_sensitive=False) # simple function to ensure the extension is set.
bpy.path.resolve_ncase(path) # useful for importing scenes made on windows where the path case doesnt match the files.
Diffstat (limited to 'release/scripts/io/netrender')
-rw-r--r-- | release/scripts/io/netrender/client.py | 10 | ||||
-rw-r--r-- | release/scripts/io/netrender/repath.py | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index e9479f92ea8..4a116bb982a 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -49,7 +49,7 @@ def addPointCache(job, ob, point_cache, default_path): if name == "": name = "".join(["%02X" % ord(c) for c in ob.name]) - cache_path = bpy.utils.expandpath(point_cache.filepath) if point_cache.external else default_path + cache_path = bpy.path.abspath(point_cache.filepath) if point_cache.external else default_path index = "%02i" % point_cache.index @@ -113,7 +113,7 @@ def clientSendJob(conn, scene, anim = False): # LIBRARIES ########################### for lib in bpy.data.libraries: - file_path = bpy.utils.expandpath(lib.filepath) + file_path = bpy.path.abspath(lib.filepath) if os.path.exists(file_path): job.addFile(file_path) @@ -122,7 +122,7 @@ def clientSendJob(conn, scene, anim = False): ########################### for image in bpy.data.images: if image.source == "FILE" and not image.packed_file: - file_path = bpy.utils.expandpath(image.filepath) + file_path = bpy.path.abspath(image.filepath) if os.path.exists(file_path): job.addFile(file_path) @@ -139,7 +139,7 @@ def clientSendJob(conn, scene, anim = False): for object in bpy.data.objects: for modifier in object.modifiers: if modifier.type == 'FLUID_SIMULATION' and modifier.settings.type == "DOMAIN": - addFluidFiles(job, bpy.utils.expandpath(modifier.settings.path)) + addFluidFiles(job, bpy.path.abspath(modifier.settings.path)) elif modifier.type == "CLOTH": addPointCache(job, object, modifier.point_cache, default_path) elif modifier.type == "SOFT_BODY": @@ -149,7 +149,7 @@ def clientSendJob(conn, scene, anim = False): if modifier.domain_settings.highres: addPointCache(job, object, modifier.domain_settings.point_cache_high, default_path) elif modifier.type == "MULTIRES" and modifier.external: - file_path = bpy.utils.expandpath(modifier.filepath) + file_path = bpy.path.abspath(modifier.filepath) job.addFile(file_path) # particles modifier are stupid and don't contain data diff --git a/release/scripts/io/netrender/repath.py b/release/scripts/io/netrender/repath.py index d9a13ade987..9243505bd3b 100644 --- a/release/scripts/io/netrender/repath.py +++ b/release/scripts/io/netrender/repath.py @@ -92,7 +92,7 @@ def process(paths): # LIBRARIES ########################### for lib in bpy.data.libraries: - file_path = bpy.utils.expandpath(lib.filepath) + file_path = bpy.path.abspath(lib.filepath) new_path = path_map.get(os.path.split(file_path)[1], None) if new_path: lib.filepath = new_path @@ -102,7 +102,7 @@ def process(paths): ########################### for image in bpy.data.images: if image.source == "FILE" and not image.packed_file: - file_path = bpy.utils.expandpath(image.filepath) + file_path = bpy.path.abspath(image.filepath) new_path = path_map.get(os.path.split(file_path)[1], None) if new_path: image.filepath = new_path @@ -124,7 +124,7 @@ def process(paths): if modifier.domain_settings.highres: processPointCache(modifier.domain_settings.point_cache_high) elif modifier.type == "MULTIRES" and modifier.external: - file_path = bpy.utils.expandpath(modifier.filepath) + file_path = bpy.path.abspath(modifier.filepath) new_path = path_map.get(file_path, None) if new_path: modifier.filepath = new_path |