Updated BAM to 1.1.8

This should fix T51692: Blend File Utils - AssertionError
aleabartik · Jun 10, 2017 · 43e25b2 · 43e25b2
1 parent 6f54d4e
commit 43e25b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -217,7 +217,6 @@ def report(msg):
  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 blendfile_level_cb_exit(filepath):
  # 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 report(msg):
  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)