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

…-fix Allow `OpenXRCompositionLayer` property `layer_viewport` to always be assigned `nullptr`
godotengine · May 21, 2024 · 4c0d5e5 · 4c0d5e5
2 parents 03aa828 + 3d7b712
commit 4c0d5e5
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/modules/openxr/scene/openxr_composition_layer.cpp b/modules/openxr/scene/openxr_composition_layer.cpp
@@ -165,7 +165,9 @@ void OpenXRCompositionLayer::set_layer_viewport(SubViewport *p_viewport) {
 		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;