Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 14 Jul 2017 12:34:46 +0000 (14:34 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 14 Jul 2017 12:34:46 +0000 (14:34 +0200)
tests/python/bl_load_py_modules.py

index 4935491a6beef1d598d837960f90a204c75eaf9c..80933cd5b611331d4f51318447ebf14df660110f 100644 (file)
@@ -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`.