diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp index 6071d3cb35..7fb916efde 100644 --- a/libraries/fbx/src/OBJReader.cpp +++ b/libraries/fbx/src/OBJReader.cpp @@ -473,13 +473,13 @@ bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mappi if (part < 0) { switch (i) { case 0: - parts[i].setNum(vertices.size() - abs(part) + 1); + parts[i].setNum(vertices.size() + part + 1); break; case 1: - parts[i].setNum(textureUVs.size() - abs(part) + 1); + parts[i].setNum(textureUVs.size() + part + 1); break; case 2: - parts[i].setNum(normals.size() - abs(part) + 1); + parts[i].setNum(normals.size() + part + 1); break; } } diff --git a/libraries/shared/src/Transform.cpp b/libraries/shared/src/Transform.cpp index eeb726ba72..67da2f6911 100644 --- a/libraries/shared/src/Transform.cpp +++ b/libraries/shared/src/Transform.cpp @@ -19,7 +19,7 @@ #include "shared/JSONHelpers.h" void Transform::evalRotationScale(Quat& rotation, Vec3& scale, const Mat3& rotationScaleMatrix) { - const float ACCURACY_THREASHOLD = 0.000001f; + const float ACCURACY_THREASHOLD = 0.00001f; // Following technique taken from: // http://callumhay.blogspot.com/2010/10/decomposing-affine-transforms.html @@ -49,7 +49,7 @@ void Transform::evalRotationScale(Quat& rotation, Vec3& scale, const Mat3& rotat // extract scale of the matrix as the length of each axis Mat3 scaleMat = glm::inverse(rotationMat) * rotationScaleMatrix; - scale = glm::max(Vec3(ACCURACY_THREASHOLD), Vec3(scaleMat[0][0], scaleMat[1][1], scaleMat[2][2])); + scale = Vec3(scaleMat[0][0], scaleMat[1][1], scaleMat[2][2]); // Let's work on a local matrix containing rotation only Mat3 matRot(