Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2017-06-10 12:04:07 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-06-10 12:04:07 +0300
commit43e25b2ab123a50f72e939c3254d6c34ba2e7eba (patch)
tree48f7dc2b874ac462b2a7075f7c45e1f22912982d
parent6f54d4e263339d21e13b026e53cd395d63119e0f (diff)
Updated BAM to 1.1.8
This should fix T51692: Blend File Utils - AssertionError
-rw-r--r--io_blend_utils/blender_bam-unpacked.whl/bam/__init__.py2
-rw-r--r--io_blend_utils/blender_bam-unpacked.whl/bam/blend/blendfile_pack.py4
2 files changed, 2 insertions, 4 deletions
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)