Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make GLTF not depend on CSG or GridMap #45375

Merged
merged 1 commit into from
Jan 25, 2021
Merged

Make GLTF not depend on CSG or GridMap #45375

merged 1 commit into from
Jan 25, 2021
+17 −0

Conversation

aaronfranke
Copy link
Member

In the current master, you can't have the GLTF module enabled while CSG or GridMap are disabed. This PR fixes that.

@aaronfranke aaronfranke added this to the 4.0 milestone Jan 22, 2021
@aaronfranke aaronfranke requested a review from fire January 22, 2021 22:29
@fire
Copy link
Member

fire commented Jan 22, 2021

Were you able to test the various combinations in a matrix?

@aaronfranke
Copy link
Member Author

aaronfranke commented Jan 23, 2021 •
edited
Loading

@fire Ok, I tested everything. Here is the build matrix as requested. It's exactly what I expected it would be.

no CSG, no GridMap CSG, no GridMap no CSG, GridMap CSG and GridMap
master no GLTF compiles & runs compiles & runs compiles & runs compiles & runs
master with GLTF linking fails linking fails linking fails compiles & runs
This PR no GLTF compiles & runs compiles & runs compiles & runs compiles & runs
This PR with GLTF compiles & runs compiles & runs compiles & runs compiles & runs

@akien-mga akien-mga merged commit 78661d1 into godotengine:master Jan 25, 2021
@akien-mga
Copy link
Member

Thanks!

@aaronfranke aaronfranke deleted the gltf-csg-gridmap branch January 25, 2021 23:10
@aaronfranke aaronfranke mentioned this pull request Mar 16, 2021
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akien-mga akien-mga akien-mga approved these changes

@fire fire fire approved these changes

Assignees
No one assigned
Labels
enhancement topic:import topic:3d
Projects
None yet
Milestone
4.0
Development

Successfully merging this pull request may close these issues.
4 participants
@aaronfranke @fire @akien-mga @Calinou