Skip to content

[4.1] GLTF: Preserve node visibility on import - #98879

Merged
akien-mga merged 1 commit into
godotengine:4.1from
aaronfranke:4.1-gltf-preserve-visibility
Dec 5, 2024
Merged

akien-mga merged 1 commit into
godotengine:4.1from
aaronfranke:4.1-gltf-preserve-visibility

Conversation

@aaronfranke

@aaronfranke aaronfranke commented Nov 6, 2024 •

Copy link
Copy Markdown
Member

Backport of PR #98874 for Godot 4.1. Due to conflicts, #98878 could not be automatically cherry-picked.

I also included the rename of ImporterMeshInstance3D *mesh_3d to importer_mesh_3d because 1) Improved readability and 2) May decrease friction in future backports to have this code similar to master.

Note: I am making the assumption that we are still good with cherry-picking things to 4.1 based on the fact that the cherrypick:4.1 label still exists.

@michal-gora

Copy link
Copy Markdown

Shouldn't this be moved to 4.4 milestone? Or removed if it already is?

@AThousandShips

Copy link
Copy Markdown
Member

No it's for 4.1 as it could not be cherry picked, see the description

Comment thread modules/gltf/extensions/gltf_document_extension_convert_importer_mesh.cpp Outdated
@aaronfranke
aaronfranke force-pushed the 4.1-gltf-preserve-visibility branch from a74846c to fd10868 Compare November 8, 2024 22:21
@akien-mga

akien-mga commented Nov 8, 2024 •

Copy link
Copy Markdown
Member

Does this change have conflicts for every single minor branch? If not, I'd prefer the min amount of PRs with relevant cherrypick labels (e.g. if the conflict is between 4.3 and master, make a 4.3 PR with 4.2 and 4.1 cherrypick labels).

@aaronfranke

aaronfranke commented Nov 9, 2024 •

Copy link
Copy Markdown
Member Author

@akien-mga Unfortunately, it does have conflicts with every single minor branch.

4.1 to 4.2: New function calls were added to ResourceImporterScene including set_layer_mask, set_cast_shadows_setting, and set_visibility_range_begin. (PR #78803)

4.2 to 4.3: New _copy_meta function calls were added in the GLTF module. (PRs #86183 and #87584)

4.3 to master: ImporterMeshInstance3D *mesh_3d was renamed to importer_mesh_3d. (PR #96133)

@akien-mga
akien-mga merged commit d71ff49 into godotengine:4.1 Dec 5, 2024
@akien-mga

Copy link
Copy Markdown
Member

Thanks!

@aaronfranke
aaronfranke deleted the 4.1-gltf-preserve-visibility branch December 5, 2024 00:12
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.

4 participants