From 2d423479bdeabd2a6bc1bbb51c4304c6f10fcd21 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 26 Feb 2020 19:22:48 +0100 Subject: Fix T73371: Crash caused by wrong logic in NULL pointer check. --- source/blender/editors/util/ed_util.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 43ccc1a8250..72376b977eb 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -238,15 +238,12 @@ bool ED_editors_flush_edits_for_object_ex(Main *bmain, /* Don't allow flushing while in the middle of a stroke (frees data in use). * Auto-save prevents this from happening but scripts * may cause a flush on saving: T53986. */ - if ((ob->sculpt && ob->sculpt->cache) == 0) { - - { - char *needs_flush_ptr = &ob->sculpt->needs_flush_to_id; - if (check_needs_flush && (*needs_flush_ptr == 0)) { - return false; - } - *needs_flush_ptr = 0; + if (!ELEM(NULL, ob->sculpt, ob->sculpt->cache)) { + char *needs_flush_ptr = &ob->sculpt->needs_flush_to_id; + if (check_needs_flush && (*needs_flush_ptr == 0)) { + return false; } + *needs_flush_ptr = 0; /* flush multires changes (for sculpt) */ multires_flush_sculpt_updates(ob); -- cgit v1.2.3