From b84a5679ddb48859f1276ceaf98f39f9813d7201 Mon Sep 17 00:00:00 2001
From: Andrzej Kapolka <drzej.k@gmail.com>
Date: Fri, 18 Oct 2013 14:31:56 -0700
Subject: [PATCH] Fixed merge error.

---
 interface/src/renderer/FBXReader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/src/renderer/FBXReader.cpp b/interface/src/renderer/FBXReader.cpp
index f65ceac057..7c4820bfbc 100644
--- a/interface/src/renderer/FBXReader.cpp
+++ b/interface/src/renderer/FBXReader.cpp
@@ -793,7 +793,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
                     model.postRotation = glm::mat4_cast(glm::quat(glm::radians(postRotation))) *
                         glm::translate(-rotationPivot) * glm::translate(scalePivot) *
                         glm::scale(scale) * glm::translate(-scalePivot);
-                    models.insert(object.properties.at(0).value<qint64>(), model);
+                    models.insert(object.properties.at(0).toString(), model);
 
                 } else if (object.name == "Texture") {
                     foreach (const FBXNode& subobject, object.children) {