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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-01 19:17:51 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-02-01 19:17:51 +0400
commit6baf63c83b2f138ba3d52d4123a6ee8cb9078cb5 (patch)
tree2fc6c508e78148858f76a9e8f314c573acbbbc25 /source/blender/collada/ArmatureImporter.cpp
parent496c3e4f8fc8c1e9319477f3f2f75f6474bb4b5f (diff)
Fix some warnings in the collade code, but did not fix two because they seem
to indicate bugs, left a comment about those.
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
-rw-r--r--source/blender/collada/ArmatureImporter.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 58c3f34e093..8328f4bc873 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -200,7 +200,6 @@ void ArmatureImporter::add_leaf_bone(float mat[4][4], EditBone *bone, COLLADAFW
void ArmatureImporter::fix_leaf_bones( )
{
// just setting tail for leaf bones here
- float correctionMin = 1.0f;
std::vector<LeafBone>::iterator it;
for (it = leaf_bones.begin(); it != leaf_bones.end(); it++) {
LeafBone& leaf = *it;
@@ -212,7 +211,7 @@ void ArmatureImporter::fix_leaf_bones( )
mul_v3_fl(vec, leaf_bone_length);
add_v3_v3v3(leaf.bone->tail, leaf.bone->head , vec);
- }
+ }
}
#if 0
@@ -466,8 +465,6 @@ void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, con
float mat[4][4];
float obmat[4][4];
- float angle = 0.0f;
-
// object-space
get_node_mat(obmat, root_node, NULL, NULL);
@@ -492,6 +489,7 @@ void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, con
}
+ //float angle = 0.0f;
///*mat4_to_axis_angle(ax, &angle, mat);
//pchan->bone->roll = angle;*/