diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-08-02 07:59:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-02 07:59:00 +0400 |
commit | de36dd1e99476f311055a4ac62aacc3cdbda193b (patch) | |
tree | 9035b7cd8fc2d97f4689c07454adadf6e6244ad9 /source/blender/blenkernel | |
parent | dd2db3703f4d3b36e33aa0cec31aea697227ba89 (diff) | |
parent | f45dcf022db02272d495ddfb07ffffe50e3f7f70 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22099:22130
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/packedFile.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index eb8a894e800..7b894d79b45 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -2213,7 +2213,7 @@ static void where_is_pose_bone(Scene *scene, Object *ob, bPoseChannel *pchan, fl Mat4MulSerie(pchan->pose_mat, tmat, offs_bone, pchan->chan_mat, NULL, NULL, NULL, NULL, NULL); } else if(bone->flag & BONE_NO_SCALE) { - float orthmat[4][4], vec[3]; + float orthmat[4][4]; /* get the official transform, but we only use the vector from it (optimize...) */ Mat4MulSerie(pchan->pose_mat, parchan->pose_mat, offs_bone, pchan->chan_mat, NULL, NULL, NULL, NULL, NULL); diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 02b0f6a45a0..590189fbd5d 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -360,6 +360,8 @@ int checkPackedFile(char *filename, PackedFile *pf) } } } + + close(file); } } |