[Bf-blender-cvs] [10bab568d33] blender2.8: Fix assertion failure evaluating depsgraph on an empty armature.

Alexander Gavrilov noreply at git.blender.org
Wed Nov 14 17:15:51 CET 2018


Commit: 10bab568d3392dcd9feb11597d308c9ddc208c7a
Author: Alexander Gavrilov
Date:   Wed Nov 14 18:54:56 2018 +0300
Branches: blender2.8
https://developer.blender.org/rB10bab568d3392dcd9feb11597d308c9ddc208c7a

Fix assertion failure evaluating depsgraph on an empty armature.

If there are no bones, chan_array may not be allocated.

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

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

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

diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index ce87050f8bf..c9e072caa6e 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -760,9 +760,8 @@ void BKE_pose_eval_cleanup(struct Depsgraph *depsgraph,
 	/* release the IK tree */
 	BIK_release_tree(scene, ob, ctime);
 
-	BLI_assert(pose->chan_array != NULL);
-	MEM_freeN(pose->chan_array);
-	pose->chan_array = NULL;
+	BLI_assert(pose->chan_array != NULL || BLI_listbase_is_empty(&pose->chanbase));
+	MEM_SAFE_FREE(pose->chan_array);
 }
 
 void BKE_pose_eval_proxy_init(struct Depsgraph *depsgraph, Object *object)



More information about the Bf-blender-cvs mailing list