diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-02-07 14:14:36 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-02-23 13:26:55 +0000 |
| commit | 4cc86c178ba35c7769f1019253441e3352a3e957 (patch) | |
| tree | 1d9fed28bb88f259e962a27c199de56897c47c45 /src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | |
| parent | 35dd440b809468b6705d2d34cec42fe0788cbc1c (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/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp index d1f881c6..b21bf949 100644 --- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp +++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineItemBinding.cpp @@ -346,7 +346,6 @@ void Qt3DSDMTimelineItemBinding::SetName(const Q3DStudio::CString &inName) return; } - Q3DStudio::CString oldPath = GetObjectPath(); CClientDataModelBridge *theBridge = m_StudioSystem->GetClientDataModelBridge(); if (!theBridge->CheckNameUnique(m_DataHandle, inName)) { QString theTitle = QObject::tr("Rename Object Error"); @@ -560,11 +559,7 @@ bool Qt3DSDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransacti qt3dsdm::Qt3DSDMInstanceHandle theInstance = GetInstance(); switch (inTransaction) { case EUserTransaction_Rename: - // DataInput renaming is forbidden by convention. DataInput name is - // permanently assigned when it is added to the scene from a fixed list of - // available datainputs - return (GetObjectType() != OBJTYPE_SCENE && GetObjectType() != OBJTYPE_IMAGE - && GetObjectType() != OBJTYPE_DATAINPUT); + return (GetObjectType() != OBJTYPE_SCENE && GetObjectType() != OBJTYPE_IMAGE); case EUserTransaction_Duplicate: if (theInstance.Valid()) @@ -596,14 +591,11 @@ bool Qt3DSDMTimelineItemBinding::IsValidTransaction(EUserTransaction inTransacti // component. // This may include behavior assets which may be directly attached to the Scene. // This is because by principal, components cannot exist on the Scene directly. - // DataInputs cannot reside inside component as they must be direct children - // of scene qt3dsdm::Qt3DSDMInstanceHandle theParentInstance = theBridge->GetParentInstance(theInstance); if (theObjectType != OBJTYPE_LAYER && theObjectType != OBJTYPE_SCENE && theObjectType != OBJTYPE_MATERIAL && theObjectType != OBJTYPE_IMAGE - && theObjectType != OBJTYPE_EFFECT && theObjectType != OBJTYPE_DATAINPUT - && theObjectType != OBJTYPE_COMPONENT + && theObjectType != OBJTYPE_EFFECT && theObjectType != OBJTYPE_COMPONENT && (theParentInstance.Valid() && theBridge->GetObjectType(theParentInstance) != OBJTYPE_SCENE)) // This checks if the object is |