diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-27 01:58:06 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-27 01:58:06 +0400 |
commit | 4f3ca854e1e25d855c7c2b8f6458edd6aae385c5 (patch) | |
tree | 60f07ffa26286fcde603977b6482a10f92a0ad11 /source/blender/collada/ArmatureImporter.h | |
parent | 1927f446868e71c56e8032b4693004225ee5177d (diff) |
Fix various warnings with clang build, and adjust cmake clang warnings flags
to include a few more that gcc is using too.
Diffstat (limited to 'source/blender/collada/ArmatureImporter.h')
-rw-r--r-- | source/blender/collada/ArmatureImporter.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index b07edfbf34d..2a8f1a65e21 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -96,7 +96,6 @@ private: std::map<COLLADAFW::UniqueId, Object*> unskinned_armature_map; MeshImporterBase *mesh_importer; - AnimationImporterBase *anim_importer; // This is used to store data passed in write_controller_data. // Arrays from COLLADAFW::SkinControllerData lose ownership, so do this class members @@ -138,7 +137,7 @@ private: TagsMap uid_tags_map; public: - ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, AnimationImporterBase *anim, Scene *sce); + ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, Scene *sce); ~ArmatureImporter(); void add_joint(COLLADAFW::Node *node, bool root, Object *parent, Scene *sce); |