[Bf-extensions-cvs] [43e25b2a] master: Updated BAM to 1.1.8
Sybren A. Stüvel
noreply at git.blender.org
Sat Jun 10 11:04:17 CEST 2017
Commit: 43e25b2ab123a50f72e939c3254d6c34ba2e7eba
Author: Sybren A. Stüvel
Date: Sat Jun 10 11:04:07 2017 +0200
Branches: master
https://developer.blender.org/rBA43e25b2ab123a50f72e939c3254d6c34ba2e7eba
Updated BAM to 1.1.8
This should fix T51692: Blend File Utils - AssertionError
===================================================================
M io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py
M io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py
===================================================================
diff --git a/io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py b/io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py
index cd0a5014..26c0a813 100644
--- a/io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py
+++ b/io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-__version__ = '1.1.7'
+__version__ = '1.1.8'
if __name__ == '__main__':
from .cli import main
diff --git a/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py
index 39c97ea1..706b109c 100644
--- a/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py
+++ b/io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py
@@ -217,7 +217,6 @@ def pack(
base_dir_dst = os.path.dirname(blendfile_dst)
# _dbg(blendfile_src)
# _dbg(blendfile_dst)
- assert base_dir_src != base_dir_dst
if base_dir_dst_temp is None:
# Always try to pack using a unique folder name.
@@ -413,7 +412,6 @@ def pack(
# add to copy-list
# never copy libs (handled separately)
if not isinstance(fp, blendfile_path_walker.FPElem_block_path) or fp.userdata[0].code != b'LI':
- assert path_src != path_dst
path_copy_files.add((path_src, path_dst))
for file_list in (
@@ -663,7 +661,7 @@ def main():
args.path_src.encode('utf8'),
args.path_dst.encode('utf8'),
mode=args.mode,
- base_dir_dst_temp=args.temp_path,
+ base_dir_dst_temp=args.temp_path.encode('utf8'),
filename_filter=exclusion_filter(args.exclude),
):
report(msg)
More information about the Bf-extensions-cvs
mailing list