asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #92200 from devloglogan/composition-layer-viewport-fix

Browse source 
Allow `OpenXRCompositionLayer` property `layer_viewport` to always be assigned `nullptr`
This commit is contained in:
Rémi Verschelde 2024-05-21 23:19:03 +02:00
commit 4c0d5e59bf
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/openxr/scene/openxr_composition_layer.cpp
View file

@ -165,7 +165,9 @@ void OpenXRCompositionLayer::set_layer_viewport(SubViewport *p_viewport) {
return; return;
} }
ERR_FAIL_COND_EDMSG(is_viewport_in_use(p_viewport), RTR("Cannot use the same SubViewport with multiple OpenXR composition layers. Clear it from its current layer first.")); if (p_viewport != nullptr) {
ERR_FAIL_COND_EDMSG(is_viewport_in_use(p_viewport), RTR("Cannot use the same SubViewport with multiple OpenXR composition layers. Clear it from its current layer first."));
}
layer_viewport = p_viewport; layer_viewport = p_viewport;