diff options
| -rw-r--r-- | src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp index 237f0413..c4f7c960 100644 --- a/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp +++ b/src/Authoring/Client/Code/Core/Doc/DocumentEditor.cpp @@ -3193,7 +3193,9 @@ public: || inInsertType == DocumentEditorInsertType::NextSibling) theParent = GetParent(inDest); + // Moving object into into non-root component if (m_Bridge.IsComponentInstance(theParent) + && !m_Bridge.IsActiveComponent(theParent) && moveIntoComponent(inInstances, theParent, checkUniqueName, notifyRename)) { return; } @@ -4428,9 +4430,11 @@ public: return 0; } - // Create text instance + // Create text instance. Don't set timerange, matching to other + // objects creation in CBasicObjectDropSource::GenerateAssetCommand() qt3dsdm::Qt3DSDMInstanceHandle theTextInstance = - CreateSceneGraphInstance(ComposerObjectTypes::Text, inParent, inSlide); + CreateSceneGraphInstance(ComposerObjectTypes::Text, inParent, inSlide, + TInstanceHandle(), false); // Set the Font property to the font file m_PropertySystem.SetInstancePropertyValue(theTextInstance, m_Bridge.GetText().m_Font, |