Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavrilov <angavrilov@gmail.com>2018-12-18 19:51:05 +0300
committerAlexander Gavrilov <angavrilov@gmail.com>2018-12-18 19:52:13 +0300
commit1ca7b6ca858dcbb5ff010f985adc986637c75f32 (patch)
treea350789780dedf57ed951b0e349f2a4d5b981ae5 /source/blender/blenkernel/intern/armature_update.c
parent0d979b8e6f209b9702ebf8aaeae0dc74c05b7a51 (diff)
Fix T59569: crashes when generate rig.
The fix in 9fa408f51b missed one place that needed the check, causing the assert because of incomplete data.
Diffstat (limited to 'source/blender/blenkernel/intern/armature_update.c')
-rw-r--r--source/blender/blenkernel/intern/armature_update.c4
1 files changed, 4 insertions, 0 deletions
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);