Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T73371: Crash caused by wrong logic in NULL pointer check.

Browse Source
This commit is contained in:
Bastien Montagne
2020-02-26 19:22:48 +01:00
parent 9085b7e847
commit 2d423479bd
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/util/ed_util.c
View File

@@ -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). /* Don't allow flushing while in the middle of a stroke (frees data in use).
* Auto-save prevents this from happening but scripts * Auto-save prevents this from happening but scripts
* may cause a flush on saving: T53986. */ * may cause a flush on saving: T53986. */
if ((ob->sculpt && ob->sculpt->cache) == 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)) {
char *needs_flush_ptr = &ob->sculpt->needs_flush_to_id; return false;
if (check_needs_flush && (*needs_flush_ptr == 0)) {
return false;
}
*needs_flush_ptr = 0;
} }
*needs_flush_ptr = 0;
/* flush multires changes (for sculpt) */ /* flush multires changes (for sculpt) */
multires_flush_sculpt_updates(ob); multires_flush_sculpt_updates(ob);