diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-07-05 10:41:42 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-07-05 10:53:24 +0300 |
| commit | 4e95617769c4c951a0f921feb30bc4312f86ce58 (patch) | |
| tree | 7bddc6e1dafed09ee78db18cd18257c98eea683d /source/blender/editors/hair/hair_undo.c | |
| parent | 73140ca2834f41ee118275fd1df0d492a554f7e8 (diff) | |
| parent | 39ae324918176a1a94de0c6be4466fdffa2fe711 (diff) | |
Merge branch 'master' into strand_editmode
Diffstat (limited to 'source/blender/editors/hair/hair_undo.c')
| -rw-r--r-- | source/blender/editors/hair/hair_undo.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/hair/hair_undo.c b/source/blender/editors/hair/hair_undo.c index 511bd8edaf1..cb5ae43f5dd 100644 --- a/source/blender/editors/hair/hair_undo.c +++ b/source/blender/editors/hair/hair_undo.c @@ -121,7 +121,8 @@ static void strands_undo_to_edit(void *undov, void *editv, void *UNUSED(obdata)) edit->base.bm->shapenr = undo->shapenr; - bm = BM_mesh_create(&allocsize); + bm = BM_mesh_create(&allocsize, + &((struct BMeshCreateParams){.use_toolflags = false,})); params.cd_mask_extra = CD_MASK_STRANDS_BMESH; params.active_shapekey = undo->shapenr; BM_mesh_bm_from_me(bm, &undo->me, ¶ms); |