Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-03-11 21:57:40 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-03-11 22:59:49 +0300
commit2de0daa179617c4eb759f6298485a577e7ee2dfe (patch)
treeaa8162e83cd10bf2dfe55272356e860b4222e811
parent86b1887ded6fc75cf495aabf38022f1231c912ca (diff)
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.
-rw-r--r--source/blender/collada/AnimationImporter.cpp12
1 files changed, 6 insertions, 6 deletions
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<FCurve *>::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);
}