[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48714] branches/soc-2012-bratwurst/extern /assimp/code: - ext_assimp: merge https://github.com/acgessler/ assimp-gsoc2012-fbx - gcc 4.6 compilation fixes.

[Alexander Gessler]

Revision: 48714
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48714
Author:   aramis_acg
Date:     2012-07-07 17:20:37 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
- ext_assimp: merge https://github.com/acgessler/assimp-gsoc2012-fbx - gcc 4.6 compilation fixes.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/extern/assimp/code/FBXConverter.cpp
    branches/soc-2012-bratwurst/extern/assimp/code/FBXProperties.h
    branches/soc-2012-bratwurst/extern/assimp/code/FBXUtil.h

Modified: branches/soc-2012-bratwurst/extern/assimp/code/FBXConverter.cpp
===================================================================
--- branches/soc-2012-bratwurst/extern/assimp/code/FBXConverter.cpp	2012-07-07 14:58:40 UTC (rev 48713)
+++ branches/soc-2012-bratwurst/extern/assimp/code/FBXConverter.cpp	2012-07-07 17:20:37 UTC (rev 48714)
@@ -222,7 +222,7 @@
 
 			const MeshGeometry* const mesh = dynamic_cast<const MeshGeometry*>(geo);
 			if(mesh) {
-				std::vector<unsigned int>& indices = ConvertMesh(*mesh, model);
+				const std::vector<unsigned int>& indices = ConvertMesh(*mesh, model);
 				std::copy(indices.begin(),indices.end(),std::back_inserter(meshes) );
 			}
 			else {

Modified: branches/soc-2012-bratwurst/extern/assimp/code/FBXProperties.h
===================================================================
--- branches/soc-2012-bratwurst/extern/assimp/code/FBXProperties.h	2012-07-07 14:58:40 UTC (rev 48713)
+++ branches/soc-2012-bratwurst/extern/assimp/code/FBXProperties.h	2012-07-07 17:20:37 UTC (rev 48714)
@@ -143,7 +143,7 @@
 	const T& defaultValue, 
 	bool ignoreTemplate = false)
 {
-	const Property* const prop = PropertyGet(in,name);
+	const Property* const prop = in.Get(name);
 	if(!prop) {
 		return defaultValue;
 	}

Modified: branches/soc-2012-bratwurst/extern/assimp/code/FBXUtil.h
===================================================================
--- branches/soc-2012-bratwurst/extern/assimp/code/FBXUtil.h	2012-07-07 14:58:40 UTC (rev 48713)
+++ branches/soc-2012-bratwurst/extern/assimp/code/FBXUtil.h	2012-07-07 17:20:37 UTC (rev 48714)
@@ -46,12 +46,11 @@
 
 #include <string>
 #include "FBXCompileConfig.h"
+#include "FBXTokenizer.h"
 
 namespace Assimp {
 namespace FBX {
 
-	class Token;
-	enum TokenType;
 
 namespace Util {