From 3d11dde8ad44d867b1b926f822891b9630015951 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 10 Mar 2015 20:27:31 -0700
Subject: [PATCH] Check that the user configures a skeleton root joint

Instead of just checking that the model has a "Hips" joint.
---
 interface/src/ModelUploader.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/interface/src/ModelUploader.cpp b/interface/src/ModelUploader.cpp
index ad57fe21ad..a6b51aa938 100644
--- a/interface/src/ModelUploader.cpp
+++ b/interface/src/ModelUploader.cpp
@@ -178,11 +178,22 @@ bool ModelUploader::zip() {
     QByteArray fbxContents = fbx.readAll();
     FBXGeometry geometry = readFBX(fbxContents, QVariantHash());
 
-    // Make sure that a skeleton model has a skeleton
-    if (_modelType == SKELETON_MODEL && !geometry.getJointNames().contains("Hips")) {
-        qDebug() << QString("[Warning] %1 does not contain a skeleton.").arg(filename);
+    // make sure we have some basic mappings
+    populateBasicMapping(mapping, filename, geometry);
+
+    // open the dialog to configure the rest
+    ModelPropertiesDialog properties(_modelType, mapping, basePath, geometry);
+    if (properties.exec() == QDialog::Rejected) {
+        return false;
+    }
+    mapping = properties.getMapping();
     
-        QString message = "Your selected skeleton model has no skeleton.\n\nThe upload will be canceled.";
+    // Make sure that a mapping for the root joint has been specified
+    QVariantHash joints = mapping.value(JOINT_FIELD).toHash();
+    if (!joints.contains("jointRoot")) {
+        qDebug() << QString("[Warning] %1 root joint not configured for skeleton.").arg(filename);
+        
+        QString message = "Your did not configure a root joint for your skeleton model.\n\nThe upload will be canceled.";
         QMessageBox msgBox;
         msgBox.setWindowTitle("Model Upload");
         msgBox.setText(message);
@@ -193,16 +204,6 @@ bool ModelUploader::zip() {
         return false;
     }
 
-    // make sure we have some basic mappings
-    populateBasicMapping(mapping, filename, geometry);
-    
-    // open the dialog to configure the rest
-    ModelPropertiesDialog properties(_modelType, mapping, basePath, geometry);
-    if (properties.exec() == QDialog::Rejected) {
-        return false;
-    }
-    mapping = properties.getMapping();
-    
     QByteArray nameField = mapping.value(NAME_FIELD).toByteArray();
     QString urlBase;
     if (!nameField.isEmpty()) {