From 2de0daa179617c4eb759f6298485a577e7ee2dfe Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Sun, 11 Mar 2018 19:57:40 +0100 Subject: Cleanup Collada: Make sure index variables are not reused The variables i and j have been declared before in the same function. I changed the names to mi and mj to keep things clear. --- source/blender/collada/AnimationImporter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 0b61f7fa8b2..f7ea8342eae 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -1834,14 +1834,14 @@ bool AnimationImporter::evaluate_animation(COLLADAFW::Transformation *tm, float } COLLADABU::Math::Matrix4 matrix; - int i = 0, j = 0; + int mi = 0, mj = 0; for (std::vector::iterator it = curves.begin(); it != curves.end(); it++) { - matrix.setElement(i, j, evaluate_fcurve(*it, fra)); - j++; - if (j == 4) { - i++; - j = 0; + matrix.setElement(mi, mj, evaluate_fcurve(*it, fra)); + mj++; + if (mj == 4) { + mi++; + mj = 0; } fcurve_is_used(*it); } -- cgit v1.2.3