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>2012-04-19 16:45:56 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-19 16:45:56 +0400
commit3ef79439100a910f2f23b8ad1d3584984d289ee9 (patch)
treec962832271925fe410f479dedddda848a01eb5fc /source/blender/blenkernel
parent7cadd242d3eb7a29f19efe1d1462dbe12998c196 (diff)
code cleanup: first step to replace BM_ITER BM_ITER_INDEX macros.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/customdata.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index f2238a37ff9..b0c0294ca39 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -2191,7 +2191,7 @@ void CustomData_bmesh_merge(CustomData *source, CustomData *dest,
if (t != BM_LOOPS_OF_FACE) {
/*ensure all current elements follow new customdata layout*/
- BM_ITER (h, &iter, bm, t, NULL) {
+ BM_ITER_MESH (h, &iter, bm, t) {
tmp = NULL;
CustomData_bmesh_copy_data(&destold, dest, h->data, &tmp);
CustomData_bmesh_free_block(&destold, &h->data);