v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbx: gcc 4.6 compile fixes

pull/14/head
acgessler 2012-07-07 20:46:29 +02:00
parent 1a9790ae9a
commit e56b39ecaf
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/FBXConverter.cpp
View File

@ -222,7 +222,7 @@ private:
const MeshGeometry* const mesh = dynamic_cast<const MeshGeometry*>(geo); const MeshGeometry* const mesh = dynamic_cast<const MeshGeometry*>(geo);
if(mesh) { 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) ); std::copy(indices.begin(),indices.end(),std::back_inserter(meshes) );
} }
else { else {

2
code/FBXProperties.h
View File

@ -143,7 +143,7 @@ inline T PropertyGet(const PropertyTable& in, const std::string& name,
const T& defaultValue, const T& defaultValue,
bool ignoreTemplate = false) bool ignoreTemplate = false)
{ {
const Property* const prop = PropertyGet(in,name); const Property* const prop = in.Get(name);
if(!prop) { if(!prop) {
return defaultValue; return defaultValue;
} }

3
code/FBXUtil.h
View File

@ -46,12 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string> #include <string>
#include "FBXCompileConfig.h" #include "FBXCompileConfig.h"
#include "FBXTokenizer.h"
namespace Assimp { namespace Assimp {
namespace FBX { namespace FBX {
class Token;
enum TokenType;
namespace Util { namespace Util {