blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

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.
This commit is contained in:
Gaia Clary 2018-03-11 19:57:40 +01:00
parent 86b1887ded
commit 2de0daa179
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/collada/AnimationImporter.cpp
View File

@ -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);
}