X Tutup
Skip to content

Fix compilation errors when disable_xr=yes#111663

Merged
Repiteo merged 1 commit intogodotengine:masterfrom
LanzaSchneider:patch-4
Oct 15, 2025
Merged

Fix compilation errors when disable_xr=yes#111663
Repiteo merged 1 commit intogodotengine:masterfrom
LanzaSchneider:patch-4

Conversation

@LanzaSchneider
Copy link
Contributor

@LanzaSchneider LanzaSchneider commented Oct 15, 2025

@LanzaSchneider LanzaSchneider requested a review from a team as a code owner October 15, 2025 01:10
@AThousandShips AThousandShips added this to the 4.6 milestone Oct 15, 2025
@AThousandShips AThousandShips added the cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release label Oct 15, 2025
@AThousandShips AThousandShips requested a review from a team October 15, 2025 07:39
Copy link
Contributor

@dsnopek dsnopek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Looks good to me :-)

It appears the build system will set XR to disabled when 3D is disabled, so I think this should still do what it was doing for disable_3d=yes as well

@AThousandShips AThousandShips added regression and removed cherrypick:4.5 Considered for cherry-picking into a future 4.5.x release labels Oct 15, 2025
@AThousandShips
Copy link
Member

This was a regression from:

Which made this variable unavailable in XR disabled builds

This should be the correct solution indeed

@Repiteo Repiteo merged commit ca52453 into godotengine:master Oct 15, 2025
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Oct 15, 2025

Thanks!

@LanzaSchneider LanzaSchneider deleted the patch-4 branch October 16, 2025 01:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Godot editor build fails at 62% with disable_xr=yes

4 participants

X Tutup