Merge pull request #15095 from amerhifi/master

case 21563: adding modelScale initialization so that it does not fail the validSc…
This commit is contained in:
John Conklin II 2019-03-05 11:46:32 -08:00 committed by GitHub
commit 4729c8737e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -164,7 +164,7 @@ protected:
int _lastKnownCurrentFrame{-1};
glm::u8vec3 _color;
glm::vec3 _modelScale;
glm::vec3 _modelScale { 1.0f };
QString _modelURL;
bool _relayParentJoints;
bool _groupCulled { false };