Merge develop into gltf mesh import #4380
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge develop into glTF mesh import
…-gltf-mesh Revert "Merge develop into glTF mesh import"
Provide a PR template to expedite both internal and external contributions.
Create pull_request_template.md
Fix the link to CONTRIBUTING.md in the pull request template and simplify some of the checklist item language.
Fix bit logic mistake in PRIM_MEDIA_FIRST_CLICK_INTERACT work
Either don't track (go) or implement trackSearch onCommitSearchResult() tracks location and 'autocompletes' as it is meant for selecting and applying items from search list.
To simplify merging into mesh import branch This reverts commit b0c951f.
akleshchev
force-pushed
the
andreyk/gltf_mesh_import
branch
from
9eb213a to
af3ef42
Compare
marchcat
approved these changes
Jul 17, 2025
Geenz
approved these changes
Jul 17, 2025
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge of 'develop' branch into gltf mesh import
To simplify merging into mesh import branch I first reverted commit "Revert "Merge develop into glTF mesh import"" b0c951f which was causing severe conflicts and wasn't resolving properly.