diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-11 07:21:24 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-11 07:21:24 +0400 |
| commit | 4d7583b66f083d2b7278653016365e20f22e6d57 (patch) | |
| tree | dd626c3271fb90376805817657a4d6dc68cc6798 /source/blender/blenkernel/intern/customdata.c | |
| parent | 65497a25ba4f9468b83b9e02b9fbf96d87042192 (diff) | |
code cleanup: warnings, also add check in crash handler that a wmWindowManager is present.
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index e31d7133daf..f3548f776f5 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2345,6 +2345,7 @@ void CustomData_bmesh_merge(CustomData *source, CustomData *dest, default: /* should never happen */ BLI_assert(!"invalid type given"); iter_type = BM_VERTS_OF_MESH; + totelem = bm->totvert; } CustomData_merge(source, dest, mask, alloctype, 0); |