diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 13:38:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 13:38:38 +0400 |
| commit | 357febc168cb13981f277b32f1ea2e3488b05b99 (patch) | |
| tree | 84cc46ed9754929e577e1b59c715297a7c1d59ff /source/blender/collada/ArmatureImporter.cpp | |
| parent | 8ed1c07a7b21d916f149dfa00649579165c45979 (diff) | |
fix for building with collada and some other warnings
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
| -rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 19fa54c5044..ae25d343d36 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -576,7 +576,7 @@ void ArmatureImporter::set_pose ( Object * ob_arm , COLLADAFW::Node * root_node float obmat[4][4]; float ax[3]; - float angle = NULL; + float angle = 0.0f; // object-space get_node_mat(obmat, root_node, NULL, NULL); |