diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-12-02 03:40:58 +0300 |
commit | a35c635edb3db548e11555024ec3a384f93ce352 (patch) | |
tree | ae0c0c9435c2e7daed4cbd916e0be90df7898b51 /source/blender/editors/object | |
parent | 7164e63fefcfa26caf387a2ad04a8c51b533c32b (diff) | |
parent | f1ac64921b49eaea8658d144754a1a532198c720 (diff) |
Merge branch 'master' into tmp-overlay-enginetmp-overlay-engine
# Conflicts:
# source/blender/draw/modes/paint_texture_mode.c
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index be815fb0d10..b7c9579e277 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -445,7 +445,7 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f return false; } - EDBM_mesh_load(bmain, obedit); + EDBM_mesh_load_ex(bmain, obedit, freedata); if (freedata) { EDBM_mesh_free(me->edit_mesh); |