diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-14 20:07:01 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-14 20:10:31 +0300 |
commit | 9009622b5464f13cc9521663b43605bf85e8e0b5 (patch) | |
tree | 72d95313921af3c5687e13e58dcf6f9c4fe68232 /source/blender/editors/object | |
parent | 9521b67ac0db5958df14ff92e5334bca07902481 (diff) | |
parent | b0823962e9b82d2bfa0551cb072bd61b67ddc773 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_transform.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 033f9d190b7..7ea1a04f31f 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -1343,9 +1343,9 @@ static int object_transform_axis_target_invoke(bContext *C, wmOperator *op, cons CTX_DATA_END; xfd->object_data = object_data; - xfd->object_data_len = BLI_array_count(object_data); + xfd->object_data_len = BLI_array_len(object_data); - if (xfd->object_data_len != BLI_array_count(object_data)) { + if (xfd->object_data_len != BLI_array_len(object_data)) { xfd->object_data = MEM_reallocN(xfd->object_data, xfd->object_data_len * sizeof(*xfd->object_data)); } } 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; } |