diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-05-14 12:41:25 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-05-14 10:41:47 +0000 |
| commit | 72014dc8a76a27c8a689184cb57fdc06f853c261 (patch) | |
| tree | a30ce70b61837aa52c2d2dbd01fb87e28bb23ea7 /src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp | |
| parent | f99d72901a46539f6df66668d913deac1ec088ad (diff) | |
Revert alias duplicate
Also prevent user from adding Aliases via the Basic objects palette.
Task-number: QT3DS-1649
Change-Id: Ie3c7d8fee3f5fb875f78ee000956443295cb973b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp index 5a4fff9d..867a441b 100644 --- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp +++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp @@ -58,7 +58,8 @@ const QVector<BasicObjectItem> BasicObjectsModel::InitializeObjectModel() {tr("Text"), "Asset-Text-Normal.png"_L1, OBJTYPE_TEXT, PRIMITIVETYPE_UNKNOWN}, {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}, + // Hide alias until it will be replaced with prefabs + //{tr("Alias"), "Asset-Alias-Normal.png"_L1, OBJTYPE_ALIAS, PRIMITIVETYPE_UNKNOWN}, }; } |