diff --git a/code/FBXBinaryTokenizer.cpp b/code/FBXBinaryTokenizer.cpp index fc3a3a7b5..c7fdb8374 100644 --- a/code/FBXBinaryTokenizer.cpp +++ b/code/FBXBinaryTokenizer.cpp @@ -380,7 +380,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, unsigned int le } - uint32_t offset = 0x1b; + //uint32_t offset = 0x1b; const char* cursor = input + 0x1b; diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp index b04d8881c..3a21a89ee 100644 --- a/code/FBXConverter.cpp +++ b/code/FBXConverter.cpp @@ -97,9 +97,9 @@ public: public: Converter(aiScene* out, const Document& doc) - : out(out) + : defaultMaterialIndex() + , out(out) , doc(doc) - , defaultMaterialIndex() { // animations need to be converted first since this will // populate the node_anim_chain_bits map, which is needed @@ -1171,7 +1171,6 @@ private: ai_assert(cluster); const WeightIndexArray& indices = cluster->GetIndices(); - const WeightArray& weights = cluster->GetWeights(); if(indices.empty()) { continue; @@ -1198,7 +1197,7 @@ private: count_out_indices.push_back(0); for(unsigned int i = 0; i < count; ++i) { - if (no_mat_check || mats[geo.FaceForVertexIndex(out_idx[i])] == materialIndex) { + if (no_mat_check || static_cast(mats[geo.FaceForVertexIndex(out_idx[i])]) == materialIndex) { if (index_out_indices.back() == no_index_sentinel) { index_out_indices.back() = out_indices.size(); diff --git a/code/FBXDocument.cpp b/code/FBXDocument.cpp index b0c2de289..49f4afe14 100644 --- a/code/FBXDocument.cpp +++ b/code/FBXDocument.cpp @@ -231,8 +231,8 @@ Object::~Object() // ------------------------------------------------------------------------------------------------ FileGlobalSettings::FileGlobalSettings(const Document& doc, boost::shared_ptr props) -: doc(doc) -, props(props) +: props(props) +, doc(doc) { } @@ -579,7 +579,7 @@ std::vector Document::GetConnectionsSequenced(uint64_t id, bo for (size_t i = 0; i < c; ++i) { ai_assert(classnames[i]); - if(std::distance(key.begin(),key.end()) == lenghts[i] && !strncmp(classnames[i],obtype,lenghts[i])) { + if(static_cast(std::distance(key.begin(),key.end())) == lenghts[i] && !strncmp(classnames[i],obtype,lenghts[i])) { obtype = NULL; break; }