fbx: gcc 4.6 compile fixes
parent
1a9790ae9a
commit
e56b39ecaf
|
@ -222,7 +222,7 @@ private:
|
|||
|
||||
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 {
|
||||
|
|
|
@ -143,7 +143,7 @@ inline T PropertyGet(const PropertyTable& in, const std::string& name,
|
|||
const T& defaultValue,
|
||||
bool ignoreTemplate = false)
|
||||
{
|
||||
const Property* const prop = PropertyGet(in,name);
|
||||
const Property* const prop = in.Get(name);
|
||||
if(!prop) {
|
||||
return defaultValue;
|
||||
}
|
||||
|
|
|
@ -46,12 +46,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
#include <string>
|
||||
#include "FBXCompileConfig.h"
|
||||
#include "FBXTokenizer.h"
|
||||
|
||||
namespace Assimp {
|
||||
namespace FBX {
|
||||
|
||||
class Token;
|
||||
enum TokenType;
|
||||
|
||||
namespace Util {
|
||||
|
||||
|
|
Loading…
Reference in New Issue