[Bf-blender-cvs] [1ca7b6ca858] blender2.8: Fix T59569: crashes when generate rig.

Alexander Gavrilov noreply at git.blender.org
Tue Dec 18 17:58:54 CET 2018


Commit: 1ca7b6ca858dcbb5ff010f985adc986637c75f32
Author: Alexander Gavrilov
Date:   Tue Dec 18 19:51:05 2018 +0300
Branches: blender2.8
https://developer.blender.org/rB1ca7b6ca858dcbb5ff010f985adc986637c75f32

Fix T59569: crashes when generate rig.

The fix in 9fa408f51b missed one place that needed the
check, causing the assert because of incomplete data.

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

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 bf5267c067f..e155c14ce4a 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -794,6 +794,10 @@ void BKE_pose_splineik_evaluate(struct Depsgraph *depsgraph,
 /* Common part for both original and proxy armatrues. */
 static void pose_eval_done_common(struct Depsgraph *depsgraph, Object *object)
 {
+	const bArmature *armature = (bArmature *)object->data;
+	if (armature->edbo != NULL) {
+		return;
+	}
 	bPose *pose = object->pose;
 	UNUSED_VARS_NDEBUG(pose);
 	BLI_assert(pose != NULL);



More information about the Bf-blender-cvs mailing list