diff --git a/code/BlenderCustomData.h b/code/BlenderCustomData.h index 243480cb0..879f40159 100644 --- a/code/BlenderCustomData.h +++ b/code/BlenderCustomData.h @@ -68,16 +68,6 @@ namespace Assimp { */ bool isValidCustomDataType(const int cdtype); - /** - * @brief read CustomData's data to ptr to mem - * @param[out] out memory ptr to set - * @param[in] cdtype to read - * @param[in] cnt cnt of elements to read - * @param[in] db to read elements from - * @return true when ok - */ - bool readCustomData(std::shared_ptr &out, int cdtype, size_t cnt, const FileDatabase &db); - /** * @brief returns CustomDataLayer ptr for given cdtype and name * @param[in] customdata CustomData to search for wanted layer diff --git a/code/BlenderDNA.h b/code/BlenderDNA.h index d2b897d3a..85441f6e2 100644 --- a/code/BlenderDNA.h +++ b/code/BlenderDNA.h @@ -825,6 +825,17 @@ private: FileDatabase& db; }; +/** +* @brief read CustomData's data to ptr to mem +* @param[out] out memory ptr to set +* @param[in] cdtype to read +* @param[in] cnt cnt of elements to read +* @param[in] db to read elements from +* @return true when ok +*/ +bool readCustomData(std::shared_ptr &out, int cdtype, size_t cnt, const FileDatabase &db); + + } // end Blend } // end Assimp diff --git a/code/BlenderScene.h b/code/BlenderScene.h index 6343b1c35..35bc5cf1c 100644 --- a/code/BlenderScene.h +++ b/code/BlenderScene.h @@ -163,8 +163,8 @@ struct MVert : ElemBase { int bweight; MVert() : ElemBase() - , mat_nr(0) , flag(0) + , mat_nr(0) , bweight(0) {} };