[Bf-blender-cvs] [3c3d80ea22a] master: Assert: add check to last commit

Campbell Barton noreply at git.blender.org
Wed Jan 9 00:33:59 CET 2019


Commit: 3c3d80ea22af15e13237f978181a881b90c41e7c
Author: Campbell Barton
Date:   Wed Jan 9 10:32:02 2019 +1100
Branches: master
https://developer.blender.org/rB3c3d80ea22af15e13237f978181a881b90c41e7c

Assert: add check to last commit

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

M	source/blender/blenkernel/intern/object.c

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 62f5b018545..ce4d60f6191 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2961,7 +2961,7 @@ void BKE_object_handle_update(Depsgraph *depsgraph, Scene *scene, Object *ob)
 
 void BKE_object_sculpt_data_create(Object *ob)
 {
-	BLI_assert(ob->mode & OB_MODE_ALL_SCULPT);
+	BLI_assert((ob->sculpt == NULL) && (ob->mode & OB_MODE_ALL_SCULPT));
 	ob->sculpt = MEM_callocN(sizeof(SculptSession), __func__);
 	ob->sculpt->mode_type = ob->mode;
 }



More information about the Bf-blender-cvs mailing list