[Bf-blender-cvs] [85ccec86398] soc-2019-openxr: Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

[Julian Eisel]

Commit: 85ccec863989bd9ee9e376bcd0b9ac7fce75157b
Author: Julian Eisel
Date:   Tue Nov 19 15:30:42 2019 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rB85ccec863989bd9ee9e376bcd0b9ac7fce75157b

Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside

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



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

diff --cc source/blender/blenkernel/BKE_global.h
index de875457b2e,65c3725d994..19906991ea5
--- a/source/blender/blenkernel/BKE_global.h
+++ b/source/blender/blenkernel/BKE_global.h
@@@ -151,8 -151,8 +151,10 @@@ enum 
    G_DEBUG_IO = (1 << 17),                    /* IO Debugging (for Collada, ...)*/
    G_DEBUG_GPU_SHADERS = (1 << 18),           /* GLSL shaders */
    G_DEBUG_GPU_FORCE_WORKAROUNDS = (1 << 19), /* force gpu workarounds bypassing detections. */
 +  G_DEBUG_XR = (1 << 20),                    /* XR/OpenXR messages */
 +  G_DEBUG_XR_TIME = (1 << 21),               /* XR/OpenXR timing messages */
+ 
+   G_DEBUG_GHOST = (1 << 20), /* Debug GHOST module. */
  };
  
  #define G_DEBUG_ALL \
diff --cc source/creator/creator_args.c
index 4d4a95b44fb,6e3988a5ea6..0879e35edee
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@@ -2093,16 -2079,12 +2093,22 @@@ void main_args_setup(bContext *C, bArg
                (void *)G_DEBUG_HANDLERS);
    BLI_argsAdd(
        ba, 1, NULL, "--debug-wm", CB_EX(arg_handle_debug_mode_generic_set, wm), (void *)G_DEBUG_WM);
 +#  ifdef WITH_OPENXR
 +  BLI_argsAdd(
 +      ba, 1, NULL, "--debug-xr", CB_EX(arg_handle_debug_mode_generic_set, xr), (void *)G_DEBUG_XR);
 +  BLI_argsAdd(ba,
 +              1,
 +              NULL,
 +              "--debug-xr-time",
 +              CB_EX(arg_handle_debug_mode_generic_set, xr_time),
 +              (void *)G_DEBUG_XR_TIME);
 +#  endif
+   BLI_argsAdd(ba,
+               1,
+               NULL,
+               "--debug-ghost",
+               CB_EX(arg_handle_debug_mode_generic_set, handlers),
+               (void *)G_DEBUG_GHOST);
    BLI_argsAdd(ba, 1, NULL, "--debug-all", CB(arg_handle_debug_mode_all), NULL);
  
    BLI_argsAdd(ba, 1, NULL, "--debug-io", CB(arg_handle_debug_mode_io), NULL);