Merge branch 'dev' into wip/animationwip/animation

Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f

1 files changed, 31 insertions, 30 deletions

diff --git a/src/3rdparty/assimp/code/FileLogStream.h b/src/3rdparty/assimp/code/FileLogStream.h
index c3f648953..574a63ed6 100644
--- a/src/3rdparty/assimp/code/FileLogStream.h
+++ b/src/3rdparty/assimp/code/FileLogStream.h
@@ -1,61 +1,62 @@
 #ifndef ASSIMP_FILELOGSTREAM_H_INC
 #define ASSIMP_FILELOGSTREAM_H_INC
 
-#include "../include/assimp/LogStream.hpp"
-#include "../include/assimp/IOStream.hpp"
+#include <assimp/LogStream.hpp>
+#include <assimp/IOStream.hpp>
+#include "DefaultIOSystem.h"
 
-namespace Assimp	{
+namespace Assimp    {
 
 // ----------------------------------------------------------------------------------
-/**	@class	FileLogStream
- *	@brief	Logstream to write into a file.
+/** @class  FileLogStream
+ *  @brief  Logstream to write into a file.
  */
 class FileLogStream :
-	public LogStream
+    public LogStream
 {
 public:
-	FileLogStream( const char* file, IOSystem* io = NULL );
-	~FileLogStream();
-	void write( const char* message );
+    FileLogStream( const char* file, IOSystem* io = NULL );
+    ~FileLogStream();
+    void write( const char* message );
 
 private:
-	IOStream *m_pStream;
+    IOStream *m_pStream;
 };
 
 // ----------------------------------------------------------------------------------
-//	Constructor
+//  Constructor
 inline FileLogStream::FileLogStream( const char* file, IOSystem* io ) :
-	m_pStream(NULL)
+    m_pStream(NULL)
 {
-	if ( !file || 0 == *file )
-		return;
+    if ( !file || 0 == *file )
+        return;
 
-	// If no IOSystem is specified: take a default one
-	if (!io)
-	{
-		DefaultIOSystem FileSystem;
-		m_pStream = FileSystem.Open( file, "wt");
-	}
-	else m_pStream = io->Open( file, "wt" );
+    // If no IOSystem is specified: take a default one
+    if (!io)
+    {
+        DefaultIOSystem FileSystem;
+        m_pStream = FileSystem.Open( file, "wt");
+    }
+    else m_pStream = io->Open( file, "wt" );
 }
 
 // ----------------------------------------------------------------------------------
-//	Destructor
+//  Destructor
 inline FileLogStream::~FileLogStream()
 {
-	// The virtual d'tor should destroy the underlying file
-	delete m_pStream;
+    // The virtual d'tor should destroy the underlying file
+    delete m_pStream;
 }
 
 // ----------------------------------------------------------------------------------
-//	Write method
+//  Write method
 inline void FileLogStream::write( const char* message )
 {
-	if (m_pStream != NULL)
-	{
-		m_pStream->Write(message, sizeof(char), ::strlen(message));
-		m_pStream->Flush();
-	}
+    if (m_pStream != NULL)
+    {
+        m_pStream->Write(message, sizeof(char), ::strlen(message));
+        m_pStream->Flush();
+    }
 }
 
 // ----------------------------------------------------------------------------------