2
0
Эх сурвалжийг харах

changes according travis compiles

CwTCwT 7 жил өмнө
parent
commit
96bc2d3146

+ 0 - 10
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<void> &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

+ 11 - 0
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<void> &out, int cdtype, size_t cnt, const FileDatabase &db);
+
+
     } // end Blend
 } // end Assimp
 

+ 1 - 1
code/BlenderScene.h

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