v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes according travis compiles

pull/2005/head
CwTCwT 2018-06-09 20:22:59 +02:00
parent 2c2b76a2bb
commit 96bc2d3146
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/BlenderCustomData.h
View File

@ -68,16 +68,6 @@ namespace Assimp {
*/ */
bool isValidCustomDataType(const int cdtype); 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<void> &out, int cdtype, size_t cnt, const FileDatabase &db);
/** /**
* @brief returns CustomDataLayer ptr for given cdtype and name * @brief returns CustomDataLayer ptr for given cdtype and name
* @param[in] customdata CustomData to search for wanted layer * @param[in] customdata CustomData to search for wanted layer

11
code/BlenderDNA.h
View File

@ -825,6 +825,17 @@ private:
FileDatabase& db; 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<void> &out, int cdtype, size_t cnt, const FileDatabase &db);
} // end Blend } // end Blend
} // end Assimp } // end Assimp

2
code/BlenderScene.h
View File

@ -163,8 +163,8 @@ struct MVert : ElemBase {
int bweight; int bweight;
MVert() : ElemBase() MVert() : ElemBase()
, mat_nr(0)
, flag(0) , flag(0)
, mat_nr(0)
, bweight(0) , bweight(0)
{} {}
}; };