diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-15 16:29:06 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-16 08:21:26 +0000 |
commit | a47e479b94cbd2cdc7493d0aeac9a5afc15407d8 (patch) | |
tree | 870941b216be6884f827f0da76dfafb88f436a7e /src/Authoring/Client/Code/Core | |
parent | c3f1efdbe911cc8b54a2479e5aed38af12ac0e16 (diff) |
Fix wrong timeline rows placement after a Layer copy/paste
- Material container is part of the scene graph but not the timeline. This
caused wrong index to be sent from the graph to the timeline when an
object is added. Fixed by keeping the material container in the timeline
but hiding it.
- Few relevant clean ups and removing useless code.
Task-number: QT3DS-3406
Change-Id: I9ed8da3db4d935269650c00fc5b0a92349cf6fa3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Client/Code/Core')
-rw-r--r-- | src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp index 71dc1de1..ba6e1fd9 100644 --- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp @@ -3019,10 +3019,10 @@ public: } TInstanceHandleList PasteSceneGraphObject(const CFilePath &inFilePath, - TInstanceHandle inNewRoot, - bool inGenerateUniqueName, - DocumentEditorInsertType::Enum inInsertType, - const CPt &inPosition) override + TInstanceHandle inNewRoot, + bool inGenerateUniqueName, + DocumentEditorInsertType::Enum inInsertType, + const CPt &inPosition) override { qt3ds::QT3DSI32 theVersion = 0; std::shared_ptr<IDOMReader> theReader = m_Doc.CreateDOMReader( @@ -3116,9 +3116,9 @@ public: } void RearrangeObjects(const qt3dsdm::TInstanceHandleList &inInstances, - TInstanceHandle inDest, - DocumentEditorInsertType::Enum inInsertType, - bool checkUniqueName, bool notifyRename = true) override + TInstanceHandle inDest, + DocumentEditorInsertType::Enum inInsertType, + bool checkUniqueName, bool notifyRename = true) override { qt3dsdm::TInstanceHandleList sortableList(ToGraphOrdering(inInstances)); TInstanceHandle theParent(inDest); @@ -3126,7 +3126,7 @@ public: || inInsertType == DocumentEditorInsertType::NextSibling) theParent = GetParent(inDest); - // Moving object into into non-root component + // Moving object into non-root component if (m_Bridge.IsComponentInstance(theParent) && !m_Bridge.IsActiveComponent(theParent) && moveIntoComponent(inInstances, theParent, checkUniqueName, notifyRename)) { |