summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/BasicObjects
diff options
context:
space:
mode:
authorJanne Kangas <janne.kangas@qt.io>2018-02-07 14:14:36 +0200
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2018-02-23 13:26:55 +0000
commit4cc86c178ba35c7769f1019253441e3352a3e957 (patch)
tree1d9fed28bb88f259e962a27c199de56897c47c45 /src/Authoring/Studio/Palettes/BasicObjects
parent35dd440b809468b6705d2d34cec42fe0788cbc1c (diff)
Remove old DataInput proto code
Reverts some (not all) changes in commits: 935d8a983db25978b3e8f0dbe67323684ce4dd96 e3c6e9d38a5b6f729093fc0349784fa475af8f62 337aaa465ac78ac72ca748f0c2d4c3b6257829b8 0707c13c34653066c89d5b25abe60a779650ee27 c1fc5d13e3668a117b4f8470ecb87b77b145efb8 Task-ID: QT3DS-865 Change-Id: I6f2ce77b12e2930aee1ea3b62b34aabe10bc6d00 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/BasicObjects')
-rw-r--r--src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp
index 11b5892b..0888063d 100644
--- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp
+++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp
@@ -54,12 +54,6 @@ void BasicObjectsModel::initialize()
{tr("Camera"), "Asset-Camera-Normal.png"_L1, OBJTYPE_CAMERA, PRIMITIVETYPE_UNKNOWN},
{tr("Light"), "Asset-Light-Normal.png"_L1, OBJTYPE_LIGHT, PRIMITIVETYPE_UNKNOWN},
{tr("Alias"), "Asset-Alias-Normal.png"_L1, OBJTYPE_ALIAS, PRIMITIVETYPE_UNKNOWN},
- // For now, adding Datainput (and Layer) is done by drag-drop. TODO: remove after a separate
- // panel for adding these metaobjects exists
-
- // Master control for adding datainput functionality to studio, uncomment to enable adding
- // datainput
- // {tr("Datainput"), "Objects-DataInput-Normal.png"_L1, OBJTYPE_DATAINPUT, PRIMITIVETYPE_UNKNOWN}
};
}