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

Removed custom code for assimp < 5.0.1. #912

Merged
merged 4 commits into from
Apr 29, 2021

Conversation

Adrien4193
Copy link
Contributor

Adding assimp as a submodule is very complicated, that is why we only removed the code that makes Brayns crash with assimp 5.0.1.

@NadirRoGue
Copy link
Contributor

retest this please

1 similar comment
@ppodhajski
Copy link
Contributor

retest this please

Assimp PLY bug is still present in 5.0.0.

PLY custom importer is hence still required.

OBJ custom importer is required for mesh files > 256MB.

This reverts commit ca894d1.
So testImages should pass even if we update assimp.

Updated io/assimpImporters/BaseImporter.h

Now the vtable should match even with assimp > 5.0.1.

So the segfault should be fixed.

Fixed compile error with BRAYNS_USE_ASSIMP disabled.
@Adrien4193 Adrien4193 requested a review from NadirRoGue April 28, 2021 15:35
@Adrien4193 Adrien4193 merged commit 4ff11d4 into master Apr 29, 2021
@Adrien4193 Adrien4193 deleted the BRAYNS-256_ReplaceAssimpCustomCodeBySubmodule branch April 29, 2021 08:02
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.

3 participants