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>2013-09-12 23:51:31 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-09-12 23:51:31 +0400
commitec2464ac5f95c93b9da3a1927fda5cd7680c2c85 (patch)
treea7305a5ca326c7975ca8c9abcaccd9a7c5c41da6 /source/blender/blenkernel/intern/object.c
parent679609fbede36faf153994c104315eec68f9eadd (diff)
code cleanup: unnecessary shadowing and some minor pep8 edits.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
-rw-r--r--source/blender/blenkernel/intern/object.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 8ae0187e27d..d7abdbdea0a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3449,7 +3449,6 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
{
KDTree *tree = NULL;
unsigned int tot = 0;
- float co[3];
switch (ob->type) {
case OB_MESH:
@@ -3471,6 +3470,7 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
/* we don't how how many verts from the DM we can use */
for (i = 0; i < totvert; i++) {
if (index[i] != ORIGINDEX_NONE) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, mvert[i].co);
BLI_kdtree_insert(tree, index[i], co, NULL);
tot++;
@@ -3484,6 +3484,7 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
tree = BLI_kdtree_new(tot);
for (i = 0; i < tot; i++) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, mvert[i].co);
BLI_kdtree_insert(tree, i, co, NULL);
}
@@ -3513,6 +3514,7 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
bezt = nu->bezt;
a = nu->pntsu;
while (a--) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, bezt->vec[1]);
BLI_kdtree_insert(tree, i++, co, NULL);
bezt++;
@@ -3524,6 +3526,7 @@ KDTree *BKE_object_as_kdtree(Object *ob, int *r_tot)
bp = nu->bp;
a = nu->pntsu * nu->pntsv;
while (a--) {
+ float co[3];
mul_v3_m4v3(co, ob->obmat, bp->vec);
BLI_kdtree_insert(tree, i++, co, NULL);
bp++;