diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-12-09 12:10:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-12-09 12:15:16 +0300 |
| commit | c9dc57be3ae59fac84b243f8bfdaddaa9b5e2f20 (patch) | |
| tree | aa5d3a8c663fa9e71ac2b40470eb8b7f15383fc4 /source | |
| parent | 3d5775b69adac8a52f3971baf988e6ead7ba4603 (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) { |