diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-29 07:23:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-29 07:23:02 +0300 |
| commit | cf1cf105a0d10fb4b99d9ff01fc75520dacaacfd (patch) | |
| tree | b145acc4a42b57bf0a3691e6881fa0192ed59ecb /source/blender/blenloader | |
| parent | 95150b8414c119b4acb8f26fd19e800e5c42e4a0 (diff) | |
| parent | 7367c0bde4636e2b87d5e795556b9ce162f8eb7e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3b0d946ba47..84a57e9449a 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5679,7 +5679,13 @@ static void direct_link_object(FileData *fd, Object *ob) CLAMP(ob->rotmode, ROT_MODE_MIN, ROT_MODE_MAX); if (ob->sculpt) { - ob->sculpt = MEM_callocN(sizeof(SculptSession), "reload sculpt session"); + if (ob->mode & OB_MODE_ALL_SCULPT) { + ob->sculpt = MEM_callocN(sizeof(SculptSession), "reload sculpt session"); + ob->sculpt->mode_type = ob->mode; + } + else { + ob->sculpt = NULL; + } } link_list(fd, &ob->lodlevels); |