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.

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

Migrating Assimp for USD Animation Support #267

Merged
merged 4 commits into from
Dec 9, 2024

Conversation

AMZN-Gene
Copy link
Contributor

@AMZN-Gene AMZN-Gene commented Dec 4, 2024

Upgrading Assimp for USD animation

Cherrypick fixes from Assimp master
git cherry-pick --no-commit 811bf2df154c46e98258452afdb6fc4f9dbc64b6 7634cf84ca90c9560a2474e51a4a5e35d45ee905 401279e2f92359bc32dc607e5bc50d243cc34a24 2493deff37e60761737234670c137f4bdc07e158

Cherrypick 58b9cb3c85dc104dce6141e39a164b5f995e4f6a fix from pending Assimp PR
drummer

…imp release occurs. git cherry-pick -n 811bf2df154c46e98258452afdb6fc4f9dbc64b6 7634cf84ca90c9560a2474e51a4a5e35d45ee905 401279e2f92359bc32dc607e5bc50d243cc34a24 2493deff37e60761737234670c137f4bdc07e158

Signed-off-by: Gene Walters <[email protected]>
…is enabled. Removing unused assimp build defines

Signed-off-by: Gene Walters <[email protected]>
@AMZN-Gene AMZN-Gene merged commit 10c916d into o3de:main Dec 9, 2024
14 checks passed
@AMZN-Gene AMZN-Gene deleted the GEDS-688_USDAnimations branch December 9, 2024 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants