Merge commit 'cab6cdf7'

tools/assimp_view/Display.cpp

@@ -43,6 +43,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "SceneAnimator.h"
 #include "StringUtils.h"
 
+#include <commdlg.h>
+
 namespace AssimpView {
 
 using namespace Assimp;

tools/assimp_view/LogWindow.cpp

@@ -41,6 +41,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "assimp_view.h"
 #include "richedit.h"
+#include <commoncontrols.h>
+#include <commdlg.h>
 
 namespace AssimpView {
 

tools/assimp_view/MessageProc.cpp

@@ -44,6 +44,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 
 #include <windowsx.h>
+#include <commdlg.h>
+#include <timeapi.h>
 
 namespace AssimpView {
 

tools/assimp_view/SceneAnimator.h

@@ -72,21 +72,27 @@ struct SceneAnimNode
     size_t mChannelIndex;
 
     //! Default construction
-    SceneAnimNode() {
+    SceneAnimNode()
-        mChannelIndex = -1; mParent = NULL;
+    : mName()
+    , mParent(NULL)
+    , mChannelIndex(-1) {
+        // empty
     }
 
     //! Construction from a given name
     SceneAnimNode( const std::string& pName)
-        : mName( pName) {
+    : mName( pName)
-            mChannelIndex = -1; mParent = NULL;
+    , mParent(NULL)
+    , mChannelIndex( -1 ) {
+        // empty
     }
 
     //! Destruct all children recursively
     ~SceneAnimNode() {
-        for( std::vector<SceneAnimNode*>::iterator it = mChildren.begin(); it != mChildren.end(); ++it)
+        for (std::vector<SceneAnimNode*>::iterator it = mChildren.begin(); it != mChildren.end(); ++it) {
             delete *it;
         }
+    }
 };
 
 // ---------------------------------------------------------------------------------

tools/assimp_view/assimp_view.cpp

@@ -41,6 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include "assimp_view.h"
+#include <timeapi.h>
 #include "StringUtils.h"
 #include <map>