From 2e9ebfb1785df132548665373555bbc6f4160523 Mon Sep 17 00:00:00 2001 From: "James B. Pollack" Date: Mon, 7 Mar 2016 21:03:11 -0800 Subject: [PATCH] remove avatar head and body from pacakage model selections --- interface/src/ModelSelector.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/interface/src/ModelSelector.cpp b/interface/src/ModelSelector.cpp index c4922bdd70..2f85849fbe 100644 --- a/interface/src/ModelSelector.cpp +++ b/interface/src/ModelSelector.cpp @@ -18,8 +18,6 @@ #include "ModelSelector.h" -static const QString AVATAR_HEAD_STRING = "Avatar Head Only"; -static const QString AVATAR_BODY_STRING = "Avatar Body Only"; static const QString AVATAR_HEAD_AND_BODY_STRING = "Avatar Body with Head"; static const QString AVATAR_ATTACHEMENT_STRING = "Avatar Attachment"; static const QString ENTITY_MODEL_STRING = "Entity Model"; @@ -35,8 +33,7 @@ ModelSelector::ModelSelector() { form->addRow("Model File:", _browseButton); _modelType = new QComboBox(this); - _modelType->addItem(AVATAR_HEAD_STRING); - _modelType->addItem(AVATAR_BODY_STRING); + _modelType->addItem(AVATAR_HEAD_AND_BODY_STRING); _modelType->addItem(AVATAR_ATTACHEMENT_STRING); _modelType->addItem(ENTITY_MODEL_STRING); @@ -55,11 +52,7 @@ QFileInfo ModelSelector::getFileInfo() const { FSTReader::ModelType ModelSelector::getModelType() const { QString text = _modelType->currentText(); - if (text == AVATAR_HEAD_STRING) { - return FSTReader::HEAD_MODEL; - } else if (text == AVATAR_BODY_STRING) { - return FSTReader::BODY_ONLY_MODEL; - } else if (text == AVATAR_HEAD_AND_BODY_STRING) { +if (text == AVATAR_HEAD_AND_BODY_STRING) { return FSTReader::HEAD_AND_BODY_MODEL; } else if (text == AVATAR_ATTACHEMENT_STRING) { return FSTReader::ATTACHMENT_MODEL;