Merge remote-tracking branch 'origin/master' into blender2.8

2017-07-14 14:34:46 +02:00 · 2017-07-14 14:34:46 +02:00 · 9d318acfa7
parent 78e2238fe4 0f793ee606
commit 9d318acfa7
1 changed files with 1 additions and 1 deletions
--- a/tests/python/bl_load_py_modules.py
+++ b/tests/python/bl_load_py_modules.py
@ -38,7 +38,7 @@ BLACKLIST = {
    'io_import_dxf',  # Because of cydxfentity.so dependency

    # The unpacked wheel is only loaded when actually used, not directly on import:
-    "io_blend_utils/blender_bam-unpacked.whl",
+    os.path.join("io_blend_utils", "blender_bam-unpacked.whl"),
    }

 # Some modules need to add to the `sys.path`.