Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 59 insertions, 57 deletions

diff --git a/src/3rdparty/assimp/code/VertexTriangleAdjacency.h b/src/3rdparty/assimp/code/VertexTriangleAdjacency.h
index 9a60fc942..218607508 100644
--- a/src/3rdparty/assimp/code/VertexTriangleAdjacency.h
+++ b/src/3rdparty/assimp/code/VertexTriangleAdjacency.h
@@ -2,11 +2,11 @@
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------
 
-Copyright (c) 2006-2012, assimp team
+Copyright (c) 2006-2016, assimp team
 All rights reserved.
 
-Redistribution and use of this software in source and binary forms, 
-with or without modification, are permitted provided that the 
+Redistribution and use of this software in source and binary forms,
+with or without modification, are permitted provided that the
 following conditions are met:
 
 * Redistributions of source code must retain the above
@@ -23,16 +23,16 @@ following conditions are met:
   derived from this software without specific prior
   written permission of the assimp team.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ----------------------------------------------------------------------
@@ -43,11 +43,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_VTADJACENCY_H_INC
 
 #include "BaseProcess.h"
-#include "../include/assimp/types.h"
-#include "../include/assimp/ai_assert.h"
+#include <assimp/types.h>
+#include <assimp/ai_assert.h>
 
 struct aiMesh;
-namespace Assimp	{
+struct aiFace;
+
+namespace Assimp    {
 
 // --------------------------------------------------------------------------------------------
 /** @brief The VertexTriangleAdjacency class computes a vertex-triangle
@@ -60,63 +62,63 @@ class ASSIMP_API VertexTriangleAdjacency
 {
 public:
 
-	// ----------------------------------------------------------------------------
-	/** @brief Construction from an existing index buffer
-	 *  @param pcFaces Index buffer
-	 *  @param iNumFaces Number of faces in the buffer
-	 *  @param iNumVertices Number of referenced vertices. This value
-	 *    is computed automatically if 0 is specified.
-	 *  @param bComputeNumTriangles If you want the class to compute
-	 *    a list containing the number of referenced triangles per vertex
-	 *    per vertex - pass true.  */
-	VertexTriangleAdjacency(aiFace* pcFaces,unsigned int iNumFaces,
-		unsigned int iNumVertices = 0,
-		bool bComputeNumTriangles = true);
+    // ----------------------------------------------------------------------------
+    /** @brief Construction from an existing index buffer
+     *  @param pcFaces Index buffer
+     *  @param iNumFaces Number of faces in the buffer
+     *  @param iNumVertices Number of referenced vertices. This value
+     *    is computed automatically if 0 is specified.
+     *  @param bComputeNumTriangles If you want the class to compute
+     *    a list containing the number of referenced triangles per vertex
+     *    per vertex - pass true.  */
+    VertexTriangleAdjacency(aiFace* pcFaces,unsigned int iNumFaces,
+        unsigned int iNumVertices = 0,
+        bool bComputeNumTriangles = true);
 
 
-	// ----------------------------------------------------------------------------
-	/** @brief Destructor */
-	~VertexTriangleAdjacency();
+    // ----------------------------------------------------------------------------
+    /** @brief Destructor */
+    ~VertexTriangleAdjacency();
 
 
 public:
 
-	// ----------------------------------------------------------------------------
-	/** @brief Get all triangles adjacent to a vertex
-	 *  @param iVertIndex Index of the vertex
-	 *  @return A pointer to the adjacency list. */
-	unsigned int* GetAdjacentTriangles(unsigned int iVertIndex) const
-	{
-		ai_assert(iVertIndex < iNumVertices);
-		return &mAdjacencyTable[ mOffsetTable[iVertIndex]];
-	}
-
-
-	// ----------------------------------------------------------------------------
-	/** @brief Get the number of triangles that are referenced by
-	 *    a vertex. This function returns a reference that can be modified
-	 *  @param iVertIndex Index of the vertex
-	 *  @return Number of referenced triangles */
-	unsigned int& GetNumTrianglesPtr(unsigned int iVertIndex)
-	{
-		ai_assert(iVertIndex < iNumVertices && NULL != mLiveTriangles);
-		return mLiveTriangles[iVertIndex];
-	}
+    // ----------------------------------------------------------------------------
+    /** @brief Get all triangles adjacent to a vertex
+     *  @param iVertIndex Index of the vertex
+     *  @return A pointer to the adjacency list. */
+    unsigned int* GetAdjacentTriangles(unsigned int iVertIndex) const
+    {
+        ai_assert(iVertIndex < iNumVertices);
+        return &mAdjacencyTable[ mOffsetTable[iVertIndex]];
+    }
+
+
+    // ----------------------------------------------------------------------------
+    /** @brief Get the number of triangles that are referenced by
+     *    a vertex. This function returns a reference that can be modified
+     *  @param iVertIndex Index of the vertex
+     *  @return Number of referenced triangles */
+    unsigned int& GetNumTrianglesPtr(unsigned int iVertIndex)
+    {
+        ai_assert(iVertIndex < iNumVertices && NULL != mLiveTriangles);
+        return mLiveTriangles[iVertIndex];
+    }
 
 
 public:
 
-	//! Offset table
-	unsigned int* mOffsetTable;
+    //! Offset table
+    unsigned int* mOffsetTable;
 
-	//! Adjacency table
-	unsigned int* mAdjacencyTable;
+    //! Adjacency table
+    unsigned int* mAdjacencyTable;
 
-	//! Table containing the number of referenced triangles per vertex
-	unsigned int* mLiveTriangles;
+    //! Table containing the number of referenced triangles per vertex
+    unsigned int* mLiveTriangles;
 
-	//! Debug: Number of referenced vertices
-	unsigned int iNumVertices;
+    //! Debug: Number of referenced vertices
+    unsigned int iNumVertices;
 
 };
 }