Merge pull request #6375 from Atlante45/resize

Fix models resizing
This commit is contained in:
Stephen Birarda 2015-11-13 10:23:05 -08:00
commit 429a4d51d5

View file

@ -89,11 +89,7 @@ void Model::setScale(const glm::vec3& scale) {
} }
void Model::setScaleInternal(const glm::vec3& scale) { void Model::setScaleInternal(const glm::vec3& scale) {
float scaleLength = glm::length(_scale); if (glm::distance(_scale, scale) > METERS_PER_MILLIMETER) {
float relativeDeltaScale = glm::length(_scale - scale) / scaleLength;
const float ONE_PERCENT = 0.01f;
if (relativeDeltaScale > ONE_PERCENT || scaleLength < EPSILON) {
_scale = scale; _scale = scale;
initJointTransforms(); initJointTransforms();
} }