|
@@ -3,7 +3,7 @@
|
|
Open Asset Import Library (assimp)
|
|
Open Asset Import Library (assimp)
|
|
---------------------------------------------------------------------------
|
|
---------------------------------------------------------------------------
|
|
|
|
|
|
-Copyright (c) 2006-2012, assimp team
|
|
|
|
|
|
+Copyright (c) 2006-2015, assimp team
|
|
|
|
|
|
All rights reserved.
|
|
All rights reserved.
|
|
|
|
|
|
@@ -49,12 +49,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
#include <sstream>
|
|
#include <sstream>
|
|
#include "ColladaParser.h"
|
|
#include "ColladaParser.h"
|
|
#include "fast_atof.h"
|
|
#include "fast_atof.h"
|
|
-#include "ParsingUtils.h"
|
|
|
|
-#include <boost/scoped_ptr.hpp>
|
|
|
|
-#include <boost/foreach.hpp>
|
|
|
|
-#include "../include/assimp/DefaultLogger.hpp"
|
|
|
|
-#include "../include/assimp/IOSystem.hpp"
|
|
|
|
-#include "../include/assimp/light.h"
|
|
|
|
|
|
+#include "ParsingUtils.h"
|
|
|
|
+#include <boost/scoped_ptr.hpp>
|
|
|
|
+#include <boost/foreach.hpp>
|
|
|
|
+#include "../include/assimp/DefaultLogger.hpp"
|
|
|
|
+#include "../include/assimp/IOSystem.hpp"
|
|
|
|
+#include "../include/assimp/light.h"
|
|
|
|
|
|
|
|
|
|
using namespace Assimp;
|
|
using namespace Assimp;
|
|
@@ -1996,12 +1996,12 @@ void ColladaParser::ReadIndexData( Mesh* pMesh)
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
#ifdef ASSIMP_BUILD_DEBUG
|
|
#ifdef ASSIMP_BUILD_DEBUG
|
|
if (primType != Prim_TriFans && primType != Prim_TriStrips) {
|
|
if (primType != Prim_TriFans && primType != Prim_TriStrips) {
|
|
ai_assert(actualPrimitives == numPrimitives);
|
|
ai_assert(actualPrimitives == numPrimitives);
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
|
|
+#endif
|
|
|
|
|
|
// only when we're done reading all <p> tags (and thus know the final vertex count) can we commit the submesh
|
|
// only when we're done reading all <p> tags (and thus know the final vertex count) can we commit the submesh
|
|
subgroup.mNumFaces = actualPrimitives;
|
|
subgroup.mNumFaces = actualPrimitives;
|