Merge pull request #89734 from BastiaanOlij/openxr_reorder_wait_frame
OpenXR: Change timing of xrWaitFrame and fix XR multithreading issues
This commit is contained in:
@@ -688,6 +688,18 @@ void Viewport::_process_picking() {
|
||||
physics_picking_events.clear();
|
||||
return;
|
||||
}
|
||||
#ifndef _3D_DISABLED
|
||||
if (use_xr) {
|
||||
if (XRServer::get_singleton() != nullptr) {
|
||||
Ref<XRInterface> xr_interface = XRServer::get_singleton()->get_primary_interface();
|
||||
if (xr_interface.is_valid() && xr_interface->is_initialized() && xr_interface->get_view_count() > 1) {
|
||||
WARN_PRINT_ONCE("Object picking can't be used when stereo rendering, this will be turned off!");
|
||||
physics_object_picking = false; // don't try again.
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
_drop_physics_mouseover(true);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user