[Bf-blender-cvs] [980c7af] BendyBones: Bendy Bones: Fix for crash when enabling "Inherit EndRoll"
Joshua Leung
noreply at git.blender.org
Tue May 17 16:40:23 CEST 2016
Commit: 980c7af04a9eda63bf6497d45e89a2d3e8cbffe1
Author: Joshua Leung
Date: Thu May 12 12:46:49 2016 +1200
Branches: BendyBones
https://developer.blender.org/rB980c7af04a9eda63bf6497d45e89a2d3e8cbffe1
Bendy Bones: Fix for crash when enabling "Inherit EndRoll"
===================================================================
M source/blender/blenkernel/intern/armature.c
===================================================================
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 57f2134..7a15ae6 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -612,8 +612,11 @@ void b_bone_spline_setup(bPoseChannel *pchan, int rest, Mat4 result_array[MAX_BB
roll1 += bone->roll1;
roll2 += bone->roll2;
- if (bone->flag & BONE_ADD_PARENT_END_ROLL)
- roll1 += prev->bone->roll2;
+ if (bone->flag & BONE_ADD_PARENT_END_ROLL) {
+ if (prev && prev->bone) {
+ roll1 += prev->bone->roll2;
+ }
+ }
/* extra curve x / y */
h1[0] += bone->curveInX;
More information about the Bf-blender-cvs
mailing list