diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-09 05:25:23 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-09 05:25:23 +0300 |
| commit | a4d21441f98dbd516095e43f741b2e69911a3a1e (patch) | |
| tree | 2ae513cc277629422358e9d98d585cfd5a5f87a8 /source/blender/blenloader | |
| parent | 4069b10be869a0a8aadcf947a9e1f6db2c930fd9 (diff) | |
Avoid assert w/ recent sculpt changes on undo
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index c7e9b8cd4ad..dddf25696b3 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5646,13 +5646,11 @@ static void direct_link_object(FileData *fd, Object *ob) CLAMP(ob->rotmode, ROT_MODE_MIN, ROT_MODE_MAX); if (ob->sculpt) { + ob->sculpt = NULL; /* Only create data on undo, otherwise rely on editor mode switching. */ if (fd->memfile && (ob->mode & OB_MODE_ALL_SCULPT)) { BKE_object_sculpt_data_create(ob); } - else { - ob->sculpt = NULL; - } } link_list(fd, &ob->lodlevels); |