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

[Julian Eisel]

Commit: af928a2fb1d705147db914b954a56de42c34f76e
Author: Julian Eisel
Date:   Thu Feb 20 12:53:03 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBaf928a2fb1d705147db914b954a56de42c34f76e

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

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



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

diff --cc source/blender/makesrna/RNA_access.h
index 52c6f2c56c4,7d82b97868d..114ffcff282
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -744,13 -690,8 +690,9 @@@ extern StructRNA RNA_WireframeModifier
  extern StructRNA RNA_WoodTexture;
  extern StructRNA RNA_WorkSpace;
  extern StructRNA RNA_World;
- extern StructRNA RNA_WorldAmbientOcclusion;
  extern StructRNA RNA_WorldLighting;
  extern StructRNA RNA_WorldMistSettings;
- extern StructRNA RNA_WorldTextureSlot;
- extern StructRNA RNA_XnorController;
- extern StructRNA RNA_XorController;
 +extern StructRNA RNA_XrSessionSettings;
  extern StructRNA RNA_uiPopover;
  extern StructRNA RNA_wmOwnerIDs;