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:
authorCampbell Barton <ideasman42@gmail.com>2015-11-23 07:45:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-23 09:40:49 +0300
commit6e4cb463c44ab57331cda7ded645b4faa573bbb3 (patch)
tree8da615bcb135c1f52872a9a9b34a888a0ccf064f /source/blender/modifiers/intern/MOD_array.c
parentdaa90de3fdb5b9971b713c13a67b9c0a0990b3d7 (diff)
Cleanup: shadowing (rna, modifiers, *misc*)
Diffstat (limited to 'source/blender/modifiers/intern/MOD_array.c')
-rw-r--r--source/blender/modifiers/intern/MOD_array.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c
index 15a7e51e865..bc283e7a086 100644
--- a/source/blender/modifiers/intern/MOD_array.c
+++ b/source/blender/modifiers/intern/MOD_array.c
@@ -509,8 +509,8 @@ static DerivedMesh *arrayModifier_doArray(
#endif
if (amd->curve_ob->curve_cache && amd->curve_ob->curve_cache->path) {
- float scale = mat4_to_scale(amd->curve_ob->obmat);
- length = scale * amd->curve_ob->curve_cache->path->totdist;
+ float scale_fac = mat4_to_scale(amd->curve_ob->obmat);
+ length = scale_fac * amd->curve_ob->curve_cache->path->totdist;
}
}
}