Merge pull request #111185 from WhalesState/vp-disable-xr

More XR disable for Viewport and export.
This commit is contained in:
Thaddeus Crews 2025-10-13 19:28:56 -05:00
commit d3285f5468
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
9 changed files with 30 additions and 0 deletions

View file

@ -788,7 +788,9 @@ public:
#ifndef _3D_DISABLED
private:
// 3D audio, camera, physics, and world.
#ifndef XR_DISABLED
bool use_xr = false;
#endif // XR_DISABLED
friend class AudioListener3D;
AudioListener3D *audio_listener_3d = nullptr;
HashSet<AudioListener3D *> audio_listener_3d_set;
@ -846,8 +848,10 @@ public:
void set_use_own_world_3d(bool p_use_own_world_3d);
bool is_using_own_world_3d() const;
#ifndef XR_DISABLED
void set_use_xr(bool p_use_xr);
bool is_using_xr();
#endif // XR_DISABLED
#endif // _3D_DISABLED
Viewport();