From 06c5fa05856524030e81ace3778f73e32acce8fe Mon Sep 17 00:00:00 2001 From: kunalgosar Date: Fri, 14 Apr 2017 15:15:08 -0700 Subject: [PATCH] correctly resizing blendshapes vector --- libraries/avatars/src/HeadData.cpp | 5 ++++- libraries/render-utils/src/Model.cpp | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/avatars/src/HeadData.cpp b/libraries/avatars/src/HeadData.cpp index 6c0f0d3b5c..1e059e04ba 100644 --- a/libraries/avatars/src/HeadData.cpp +++ b/libraries/avatars/src/HeadData.cpp @@ -15,6 +15,7 @@ #include #include +#include #include #include @@ -39,7 +40,7 @@ HeadData::HeadData(AvatarData* owningAvatar) : _averageLoudness(0.0f), _browAudioLift(0.0f), _owningAvatar(owningAvatar), - _baseBlendshapeCoefficients(0, 0) + _baseBlendshapeCoefficients(QVector(0, 0)) { } @@ -102,6 +103,8 @@ void HeadData::setBlendshape(QString name, float val) { if (it != blendshapeLookupMap.end()) { if (_blendshapeCoefficients.size() <= it.value()) { _blendshapeCoefficients.resize(it.value() + 1); + } + if (_baseBlendshapeCoefficients.size() <= it.value()) { _baseBlendshapeCoefficients.resize(it.value() + 1); } _baseBlendshapeCoefficients[it.value()] = val; diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index ec82b0f606..c274d69af6 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -901,7 +901,6 @@ Blender::Blender(ModelPointer model, int blendNumber, const Geometry::WeakPointe } void Blender::run() { - qDebug() << "!!!!!!!!!!!!!!" << _blendshapeCoefficients; PROFILE_RANGE_EX(simulation_animation, __FUNCTION__, 0xFFFF0000, 0, { { "url", _model->getURL().toString() } }); QVector vertices, normals; if (_model) {