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:
authorTon Roosendaal <ton@blender.org>2005-12-14 23:36:04 +0300
committerTon Roosendaal <ton@blender.org>2005-12-14 23:36:04 +0300
commite64008e2c7b780db1c8e8a2fabc2f5cc1a0f8481 (patch)
tree54492c0cc3e4f68c09e85eb7824ae9a51df376bb /source/blender/blenloader
parent8304b73a08bc174e190c94ec05245a36e3ad66c2 (diff)
Three fixes;
- On file reading, a check is added to see if a Pose has channels to missing bones. Poses are supposed to match an Armature completely. (Thanks for crash file, Johnny!... but how did you do it!) - Own collection: added depsgraph update on setting all layers (with the ACCENTGRAVEKEY). This also could potentially crash with modifiers - Renamed Xkey menu in NLA to more properly tell what it does. :)
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1fb00163644..cb4e7546b53 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1379,6 +1379,7 @@ static void lib_link_pose(FileData *fd, Object *ob, bPose *pose)
{
bPoseChannel *pchan;
bArmature *arm= ob->data;
+ int rebuild= 0;
if (!pose)
return;
@@ -1386,6 +1387,12 @@ static void lib_link_pose(FileData *fd, Object *ob, bPose *pose)
lib_link_constraints(fd, (ID *)ob, &pchan->constraints);
// hurms... loop in a loop, but yah... later... (ton)
pchan->bone= get_named_bone(arm, pchan->name);
+ if(pchan->bone==NULL)
+ rebuild= 1;
+ }
+ if(rebuild) {
+ ob->recalc= OB_RECALC;
+ pose->flag |= POSE_RECALC;
}
}