Fix local translation with snap and scaled matrix

CedricGuillemet · Sep 19, 2016 · d91a17b · d91a17b
1 parent 967d79b
commit d91a17b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ImGuizmo.cpp b/ImGuizmo.cpp
@@ -1137,9 +1137,13 @@ namespace ImGuizmo
 				vec_t cumulativeDelta = gContext.mModel.v.position + delta - gContext.mMatrixOrigin;
 				if (applyRotationLocaly)
 				{
-					cumulativeDelta.TransformVector(gContext.mModelSourceInverse);
+					matrix_t modelSourceNormalized = gContext.mModelSource;
+					modelSourceNormalized.OrthoNormalize();
+					matrix_t modelSourceNormalizedInverse;
+					modelSourceNormalizedInverse.Inverse(modelSourceNormalized);
+					cumulativeDelta.TransformVector(modelSourceNormalizedInverse);
 					ComputeSnap(cumulativeDelta, snap);
-					cumulativeDelta.TransformVector(gContext.mModelSource);
+					cumulativeDelta.TransformVector(modelSourceNormalized);
 				}
 				else
 				{