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

Replace the deprecated QVector::fromStdVector and QVector::toStdVector(). #1482

Merged
merged 2 commits into from
Dec 26, 2021

Conversation

daleglass
Copy link
Contributor

@daleglass daleglass commented Nov 26, 2021

This should make no functional difference, but get rid of ~20 warnings.

This is based on top of PR #1468

output.edit1() = hfmModelIn->originalURL;
output.edit2() = hfmModelIn->meshIndicesToModelNames;
auto& blendshapesPerMesh = output.edit3();
blendshapesPerMesh.reserve(hfmModelIn->meshes.size());
for (int i = 0; i < hfmModelIn->meshes.size(); i++) {
blendshapesPerMesh.push_back(hfmModelIn->meshes[i].blendshapes.toStdVector());
blendshapesPerMesh.push_back(std::vector<hfm::Blendshape>(hfmModelIn->meshes[i].blendshapes.begin(), hfmModelIn->meshes[i].blendshapes.end()));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could save a reference to hfmModelIn->meshes[i] just above to avoid indexing twice

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@digisomni digisomni added CR Approved At least one code reviewer has approved the PR. housekeeping Code or documentation cleanup labels Nov 28, 2021
@digisomni digisomni added this to the 2022.1.1 Selene Release milestone Nov 28, 2021
@digisomni digisomni changed the title Replace the deprecated QVector::fromStdVector and QVector::toStdVector() Replace the deprecated QVector::fromStdVector and QVector::toStdVector(). Nov 28, 2021
@digisomni
Copy link
Member

Needs an update.

@digisomni digisomni added the needs testing (QA) The PR is ready for testing label Dec 3, 2021
@JulianGro JulianGro added the rebuild rebuild through the GithubActions label Dec 10, 2021
@JulianGro JulianGro added rebuild rebuild through the GithubActions and removed rebuild rebuild through the GithubActions labels Dec 10, 2021
@daleglass daleglass added rebuild rebuild through the GithubActions and removed rebuild rebuild through the GithubActions labels Dec 18, 2021
Copy link
Member

@digisomni digisomni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Appears to work fine. I don't think we could ever bake glTF models, right?

When I would uncheck the bake box for an FBX model, it would stay on pending... checking it again to use baked would work though. Unsure if that was an existing / related issue or not.

@digisomni digisomni added QA Approved The PR has been tested successfully. and removed needs testing (QA) The PR is ready for testing labels Dec 23, 2021
@digisomni digisomni added rebuild rebuild through the GithubActions and removed rebuild rebuild through the GithubActions labels Dec 23, 2021
@daleglass daleglass merged commit d022b00 into vircadia:master Dec 26, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CR Approved At least one code reviewer has approved the PR. housekeeping Code or documentation cleanup QA Approved The PR has been tested successfully. rebuild rebuild through the GithubActions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants