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

- fbx: fix boost build errors (was building with BOOST_WORKAROUND for a while).

pull/14/head
Alexander Gessler 2012-07-04 17:06:55 +02:00
parent 6e6dbe97de
commit 04c77029e8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/FBXDocument.cpp
View File

@ -339,7 +339,9 @@ boost::shared_ptr<const PropertyTable> GetPropertyTable(const Document& doc,
const Scope& sc) const Scope& sc)
{ {
const Element* const Properties70 = sc["Properties70"]; const Element* const Properties70 = sc["Properties70"];
boost::shared_ptr<const PropertyTable> templateProps = boost::shared_ptr<const PropertyTable>(NULL); boost::shared_ptr<const PropertyTable> templateProps = boost::shared_ptr<const PropertyTable>(
static_cast<const PropertyTable*>(NULL));
if(templateName.length()) { if(templateName.length()) {
PropertyTemplateMap::const_iterator it = doc.Templates().find(templateName); PropertyTemplateMap::const_iterator it = doc.Templates().find(templateName);
if(it != doc.Templates().end()) { if(it != doc.Templates().end()) {
@ -566,7 +568,7 @@ void Document::ReadPropertyTemplates()
const Element* Properties70 = (*sc)["Properties70"]; const Element* Properties70 = (*sc)["Properties70"];
if(Properties70) { if(Properties70) {
boost::shared_ptr<const PropertyTable> props = boost::make_shared<const PropertyTable>( boost::shared_ptr<const PropertyTable> props = boost::make_shared<const PropertyTable>(
*Properties70,boost::shared_ptr<const PropertyTable>(NULL) *Properties70,boost::shared_ptr<const PropertyTable>(static_cast<const PropertyTable*>(NULL))
); );
templates[oname+"."+pname] = props; templates[oname+"."+pname] = props;

2
code/FBXProperties.h
View File

@ -125,7 +125,7 @@ public:
} }
const PropertyTable* TemplateProps() const { const PropertyTable* TemplateProps() const {
return templateProps; return templateProps.get();
} }
private: private: