Browse Source

Merge pull request #103338 from dsnopek/openxr-passthrough-emulation-wins

OpenXR: Emulated alpha blend mode should override the real blend mode
Rémi Verschelde 5 months ago
parent
commit
dd43d401ec
1 changed files with 3 additions and 3 deletions
  1. 3 3
      modules/openxr/openxr_api.cpp

+ 3 - 3
modules/openxr/openxr_api.cpp

@@ -3641,10 +3641,10 @@ void OpenXRAPI::set_emulate_environment_blend_mode_alpha_blend(bool p_enabled) {
 }
 }
 
 
 OpenXRAPI::OpenXRAlphaBlendModeSupport OpenXRAPI::is_environment_blend_mode_alpha_blend_supported() {
 OpenXRAPI::OpenXRAlphaBlendModeSupport OpenXRAPI::is_environment_blend_mode_alpha_blend_supported() {
-	if (is_environment_blend_mode_supported(XR_ENVIRONMENT_BLEND_MODE_ALPHA_BLEND)) {
-		return OPENXR_ALPHA_BLEND_MODE_SUPPORT_REAL;
-	} else if (emulate_environment_blend_mode_alpha_blend) {
+	if (emulate_environment_blend_mode_alpha_blend) {
 		return OPENXR_ALPHA_BLEND_MODE_SUPPORT_EMULATING;
 		return OPENXR_ALPHA_BLEND_MODE_SUPPORT_EMULATING;
+	} else if (is_environment_blend_mode_supported(XR_ENVIRONMENT_BLEND_MODE_ALPHA_BLEND)) {
+		return OPENXR_ALPHA_BLEND_MODE_SUPPORT_REAL;
 	}
 	}
 	return OPENXR_ALPHA_BLEND_MODE_SUPPORT_NONE;
 	return OPENXR_ALPHA_BLEND_MODE_SUPPORT_NONE;
 }
 }