From c9dc57be3ae59fac84b243f8bfdaddaa9b5e2f20 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 9 Dec 2019 20:10:22 +1100 Subject: Fix T72145: Object.update_from_editmode crashes with empties Also corrects the return value, where objects that don't have an edit-mode returned true, making it seem as if object data was flushed. --- source/blender/editors/object/object_edit.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source') diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index b7c9579e277..8012565ba2e 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -513,6 +513,9 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f ED_mball_editmball_free(obedit); } } + else { + return false; + } char *needs_flush_ptr = BKE_object_data_editmode_flush_ptr_get(obedit->data); if (needs_flush_ptr) { -- cgit v1.2.3