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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-03-14 20:07:01 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-03-14 20:10:31 +0300
commit9009622b5464f13cc9521663b43605bf85e8e0b5 (patch)
tree72d95313921af3c5687e13e58dcf6f9c4fe68232 /source/blender/editors/object/object_vgroup.c
parent9521b67ac0db5958df14ff92e5334bca07902481 (diff)
parentb0823962e9b82d2bfa0551cb072bd61b67ddc773 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_vgroup.c')
-rw-r--r--source/blender/editors/object/object_vgroup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 00a24e7fe72..eb04de5feb2 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -1192,7 +1192,7 @@ static int *getSurroundingVerts(Mesh *me, int vert, int *count)
}
/* Append a and b verts to array, if not yet present. */
- k = BLI_array_count(verts);
+ k = BLI_array_len(verts);
/* XXX Maybe a == b is enough? */
while (k-- && !(a == b && a == -1)) {
if (verts[k] == a)
@@ -1214,7 +1214,7 @@ static int *getSurroundingVerts(Mesh *me, int vert, int *count)
}
/* Do not free the array! */
- *count = BLI_array_count(verts);
+ *count = BLI_array_len(verts);
return verts;
}