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

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-03-11 18:27:48 +0300
committerJulian Eisel <julian@blender.org>2020-03-11 18:27:48 +0300
commit00f83ec125207e90bf180b3eb7752d8cb6482a86 (patch)
tree171ccf6200cc10e1d85d623da11f588de34ae74d
parenta2d04deda79633c3a0c7306f36b8100cf2f4b49b (diff)
Cleanup and correct wrong bpy.app.build_options usage
-rw-r--r--source/blender/blenloader/intern/versioning_280.c13
-rw-r--r--source/blender/gpu/GPU_shader.h1
-rw-r--r--source/blender/windowmanager/wm.h1
-rw-r--r--tests/python/bl_load_addons.py2
-rw-r--r--tests/python/bl_load_py_modules.py2
5 files changed, 2 insertions, 17 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index d6e9826d542..34041b0ca22 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4799,19 +4799,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
- /* Keep this block, even when empty. */
- if (!DNA_struct_find(fd->filesdna, "XrSessionSettings")) {
- for (wmWindowManager *wm = bmain->wm.first; wm; wm = wm->id.next) {
- const View3D *v3d_default = DNA_struct_default_get(View3D);
-
- wm->xr.session_settings.shading_type = OB_SOLID;
- wm->xr.session_settings.draw_flags = (V3D_OFSDRAW_SHOW_GRIDFLOOR |
- V3D_OFSDRAW_SHOW_ANNOTATION);
- wm->xr.session_settings.clip_start = v3d_default->clip_start;
- wm->xr.session_settings.clip_end = v3d_default->clip_end;
- }
- }
-
/* Alembic Transform Cache changed from local to world space. */
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
LISTBASE_FOREACH (bConstraint *, con, &ob->constraints) {
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 1cc38eaae87..d5716cd1b31 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -184,7 +184,6 @@ typedef enum eGPUBuiltinShader {
GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR,
/* basic image drawing */
GPU_SHADER_2D_IMAGE_OVERLAYS_MERGE,
- GPU_SHADER_2D_IMAGE_RECT_LINEAR_TO_SRGB,
GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR,
GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR,
/**
diff --git a/source/blender/windowmanager/wm.h b/source/blender/windowmanager/wm.h
index 7904573de0c..c8dc883d731 100644
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@ -25,7 +25,6 @@
#define __WM_H__
struct ARegion;
-struct GPUOffScreen;
struct ReportList;
struct wmWindow;
diff --git a/tests/python/bl_load_addons.py b/tests/python/bl_load_addons.py
index b8c3ec7952a..f0c2f3f7fdf 100644
--- a/tests/python/bl_load_addons.py
+++ b/tests/python/bl_load_addons.py
@@ -50,7 +50,7 @@ def _init_addon_blacklist():
# netrender has known problems re-registering
BLACKLIST_ADDONS.add("netrender")
- if not bpy.app.build_options.openxr:
+ if not bpy.app.build_options.xr_openxr:
BLACKLIST_ADDONS.add("viewport_vr_preview")
for mod in addon_utils.modules():
diff --git a/tests/python/bl_load_py_modules.py b/tests/python/bl_load_py_modules.py
index 8c7180bad89..5d1a5dd8ee0 100644
--- a/tests/python/bl_load_py_modules.py
+++ b/tests/python/bl_load_py_modules.py
@@ -56,7 +56,7 @@ MODULE_SYS_PATHS = {
if not bpy.app.build_options.freestyle:
BLACKLIST.add("render_freestyle_svg")
-if not bpy.app.build_options.openxr:
+if not bpy.app.build_options.xr_openxr:
BLACKLIST.add("viewport_vr_preview")
BLACKLIST_DIRS = (