[Bf-blender-cvs] [9e382dd2a3d] master: Fix T74542, T74386: schulpt changes not saving (dyntopo or mutires)

[Philipp Oeser]

Commit: 9e382dd2a3d8569201a3e5c1a8478166c77e9029
Author: Philipp Oeser
Date:   Wed Mar 18 16:30:41 2020 +0100
Branches: master
https://developer.blender.org/rB9e382dd2a3d8569201a3e5c1a8478166c77e9029

Fix T74542, T74386: schulpt changes not saving (dyntopo or mutires)

Caused by rB2d423479bdea.
Correct check for stroke being painted.

thx also to brecht checking.

===================================================================

M	source/blender/editors/util/ed_util.c

===================================================================

diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c
index c3eae53eda0..e7d58c8f84b 100644
--- a/source/blender/editors/util/ed_util.c
+++ b/source/blender/editors/util/ed_util.c
@@ -238,7 +238,7 @@ 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 (!ELEM(NULL, ob->sculpt, ob->sculpt->cache)) {
+    if (ob->sculpt != NULL && ob->sculpt->cache == NULL) {
       char *needs_flush_ptr = &ob->sculpt->needs_flush_to_id;
       if (check_needs_flush && (*needs_flush_ptr == 0)) {
         return false;