[Bf-blender-cvs] [a4d21441f98] master: Avoid assert w/ recent sculpt changes on undo

[Campbell Barton]

Commit: a4d21441f98dbd516095e43f741b2e69911a3a1e
Author: Campbell Barton
Date:   Wed Jan 9 13:25:23 2019 +1100
Branches: master
https://developer.blender.org/rBa4d21441f98dbd516095e43f741b2e69911a3a1e

Avoid assert w/ recent sculpt changes on undo

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

M	source/blender/blenloader/intern/readfile.c

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

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