[Bf-blender-cvs] [a74af5f6f0e] soc-2019-openxr: Always generate XR-RNA, even with WITH_OPENXR disabled

[Julian Eisel]

Commit: a74af5f6f0e572f25601c33e26bde57cadef9840
Author: Julian Eisel
Date:   Mon Mar 2 14:39:12 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBa74af5f6f0e572f25601c33e26bde57cadef9840

Always generate XR-RNA, even with WITH_OPENXR disabled

===================================================================

M	source/blender/makesrna/intern/CMakeLists.txt
M	source/blender/makesrna/intern/makesrna.c
M	source/blender/makesrna/intern/rna_internal.h
M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/makesrna/intern/rna_xr.c
M	source/blender/python/intern/CMakeLists.txt

===================================================================

diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 698111a763a..7a8b1fb2f73 100644
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -92,6 +92,7 @@ set(DEFSRC
   rna_wm_gizmo.c
   rna_workspace.c
   rna_world.c
+  rna_xr.c
 )
 
 set(APISRC
@@ -122,12 +123,6 @@ set(APISRC
   rna_workspace_api.c
 )
 
-if(WITH_OPENXR)
-  list(APPEND DEFSRC
-    rna_xr.c
-  )
-endif()
-
 string(REGEX REPLACE "rna_([a-zA-Z0-9_-]*).c" "${CMAKE_CURRENT_BINARY_DIR}/rna_\\1_gen.c" GENSRC "${DEFSRC}")
 list(APPEND GENSRC
   "${CMAKE_CURRENT_BINARY_DIR}/rna_prototypes_gen.h"
@@ -331,10 +326,6 @@ if(WITH_INPUT_NDOF)
   add_definitions(-DWITH_INPUT_NDOF)
 endif()
 
-if(WITH_OPENXR)
-  add_definitions(-DWITH_OPENXR)
-endif()
-
 # Build makesrna executable
 blender_include_dirs(
   .
diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index 151818c790c..7f26e82145f 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -4279,9 +4279,7 @@ static RNAProcessItem PROCESS_ITEMS[] = {
     {"rna_movieclip.c", NULL, RNA_def_movieclip},
     {"rna_tracking.c", NULL, RNA_def_tracking},
     {"rna_mask.c", NULL, RNA_def_mask},
-#ifdef WITH_OPENXR
     {"rna_xr.c", NULL, RNA_def_xr},
-#endif
     {NULL, NULL},
 };
 
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h
index b927e6ea7ee..71753f85ac5 100644
--- a/source/blender/makesrna/intern/rna_internal.h
+++ b/source/blender/makesrna/intern/rna_internal.h
@@ -204,9 +204,7 @@ void RNA_def_world(struct BlenderRNA *brna);
 void RNA_def_movieclip(struct BlenderRNA *brna);
 void RNA_def_tracking(struct BlenderRNA *brna);
 void RNA_def_mask(struct BlenderRNA *brna);
-#ifdef WITH_OPENXR
 void RNA_def_xr(struct BlenderRNA *brna);
-#endif
 
 /* Common Define functions */
 
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index d0e38d7b307..ca9c91c1ca7 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -2472,12 +2472,10 @@ static void rna_def_windowmanager(BlenderRNA *brna)
       prop, "rna_wmClipboard_get", "rna_wmClipboard_length", "rna_wmClipboard_set");
   RNA_def_property_ui_text(prop, "Text Clipboard", "");
 
-#  ifdef WITH_OPENXR
   prop = RNA_def_property(srna, "xr_session_settings", PROP_POINTER, PROP_NONE);
   RNA_def_property_pointer_sdna(prop, NULL, "xr.session_settings");
   RNA_def_property_flag(prop, PROP_NEVER_NULL);
   RNA_def_property_ui_text(prop, "XR Session Settings", "");
-#  endif
 
   RNA_api_wm(srna);
 }
diff --git a/source/blender/makesrna/intern/rna_xr.c b/source/blender/makesrna/intern/rna_xr.c
index 68cf4a6ab18..f2f73984801 100644
--- a/source/blender/makesrna/intern/rna_xr.c
+++ b/source/blender/makesrna/intern/rna_xr.c
@@ -25,10 +25,6 @@
 
 #include "rna_internal.h"
 
-#ifndef WITH_OPENXR
-BLI_STATIC_ASSERT(false, "Tried to compile rna_xr.c even though WITH_OPENXR is not defined.");
-#endif
-
 #ifdef RNA_RUNTIME
 
 #else /* RNA_RUNTIME */
diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt
index 778ca7a7921..7106dace084 100644
--- a/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@ -330,10 +330,6 @@ if(WITH_OPENSUBDIV)
   )
 endif()
 
-if(WITH_OPENXR)
-  add_definitions(-DWITH_OPENXR)
-endif()
-
 add_definitions(${GL_DEFINITIONS})
 
 blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")