[Bf-blender-cvs] [c9dc57be3ae] master: Fix T72145: Object.update_from_editmode crashes with empties
Campbell Barton
noreply at git.blender.org
Mon Dec 9 10:16:37 CET 2019
Commit: c9dc57be3ae59fac84b243f8bfdaddaa9b5e2f20
Author: Campbell Barton
Date: Mon Dec 9 20:10:22 2019 +1100
Branches: master
https://developer.blender.org/rBc9dc57be3ae59fac84b243f8bfdaddaa9b5e2f20
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.
===================================================================
M source/blender/editors/object/object_edit.c
===================================================================
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) {
More information about the Bf-blender-cvs
mailing list