Commit: 84466c7d71595c46666314bec87e8dcfe61dafe3
Author: Julian Eisel
Date: Tue Aug 20 00:55:21 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rB84466c7d71595c46666314bec87e8dcfe61dafe3
Blacklist VR add-on in Python tests if WITH_OPENXR is disabled
===================================================================
M tests/python/bl_load_addons.py
M tests/python/bl_load_py_modules.py
===================================================================
diff --git a/tests/python/bl_load_addons.py b/tests/python/bl_load_addons.py
index bb730bc362c..b8c3ec7952a 100644
--- a/tests/python/bl_load_addons.py
+++ b/tests/python/bl_load_addons.py
@@ -50,6 +50,9 @@ def _init_addon_blacklist():
# netrender has known problems re-registering
BLACKLIST_ADDONS.add("netrender")
+ if not bpy.app.build_options.openxr:
+ BLACKLIST_ADDONS.add("viewport_vr_preview")
+
for mod in addon_utils.modules():
if addon_utils.module_bl_info(mod)['blender'] < (2, 80, 0):
BLACKLIST_ADDONS.add(mod.__name__)
diff --git a/tests/python/bl_load_py_modules.py
b/tests/python/bl_load_py_modules.py
index 3df0d6310dc..6deacef0521 100644
--- a/tests/python/bl_load_py_modules.py
+++ b/tests/python/bl_load_py_modules.py
@@ -54,6 +54,9 @@ MODULE_SYS_PATHS = {
if not bpy.app.build_options.freestyle:
BLACKLIST.add("render_freestyle_svg")
+if not bpy.app.build_options.openxr:
+ BLACKLIST.add("viewport_vr_preview")
+
BLACKLIST_DIRS = (
os.path.join(bpy.utils.resource_path('USER'), "scripts"),
) + tuple(addon_utils.paths()[1:])
@@ -201,7 +204,8 @@ def load_modules():
# check which filepaths we didn't load
source_files = []
for mod_dir in module_paths:
- source_files.extend(source_list(mod_dir, filename_check=lambda f:
f.endswith(".py")))
+ source_files.extend(source_list(
+ mod_dir, filename_check=lambda f: f.endswith(".py")))
source_files = list(set(source_files))
source_files.sort()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
