blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 756 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-10-29 15:23:02 +11:00
parent 95150b8414 7367c0bde4
commit cf1cf105a0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenloader/intern/readfile.c
View File

@ -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);