diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-06-03 03:20:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-03 03:20:49 +0400 |
commit | dfad9b0c09eed2de2c3bedd64691bf11f637725c (patch) | |
tree | 86298761e9883ca7dc83b3b5a24a859bdd07bfce /source/blender/modifiers/intern/MOD_array.c | |
parent | 99b55ef6eb7d677ead66b4166afe45688147a5b3 (diff) |
fix [#35555] Collada: export destroys mesh in some cases
add arguments to calculate normals when converting to bmesh:
BM_mesh_bm_from_me, DM_to_bmesh
This gives some speedup to undo (which didnt need to re-calculate vertex normals), and array modifier which doesnt need to calculate face normals at all
Diffstat (limited to 'source/blender/modifiers/intern/MOD_array.c')
-rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 36461851162..e09fa18ffc5 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -228,7 +228,7 @@ static void bm_merge_dm_transform(BMesh *bm, DerivedMesh *dm, float mat[4][4], /* Add the DerivedMesh's elements to the BMesh. The pre-existing * elements were already tagged, so the new elements can be * identified by not having the BM_ELEM_TAG flag set. */ - DM_to_bmesh_ex(dm, bm); + DM_to_bmesh_ex(dm, bm, false); if (amd->flags & MOD_ARR_MERGE) { /* if merging is enabled, find doubles */ @@ -330,7 +330,7 @@ static DerivedMesh *arrayModifier_doArray(ArrayModifierData *amd, int UNUSED(initFlags)) { DerivedMesh *result; - BMesh *bm = DM_to_bmesh(dm); + BMesh *bm = DM_to_bmesh(dm, false); BMOperator first_dupe_op, dupe_op, old_dupe_op, weld_op; BMVert **first_geom = NULL; int i, j; |