diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-03-13 15:04:40 +0200 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-03-19 07:57:19 +0000 |
| commit | 2b3819c8e3cde79f5b31b042bcd1fc69e84527a2 (patch) | |
| tree | 1561ece7c728f0c633ff1c2dd91736ffe75ff8c2 /src/Authoring/Studio/Palettes/Action/ActionView.cpp | |
| parent | 7044430bcfa7ceb161f9f3a15a396a401f9ea2e6 (diff) | |
Allow Action trigger/target selection outside component
Enables choosing trigger/target objects for Actions from the
entire scene graph for the active slide. Also recreate Alias reference
selection list when user enters/leaves a component.
Change-Id: I3b66bf6a93296b5fef6168f1de8341bdd1284b11
Task-id: QT3DS-1278
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Action/ActionView.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/Action/ActionView.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Authoring/Studio/Palettes/Action/ActionView.cpp b/src/Authoring/Studio/Palettes/Action/ActionView.cpp index 7e069bdc..cd645435 100644 --- a/src/Authoring/Studio/Palettes/Action/ActionView.cpp +++ b/src/Authoring/Studio/Palettes/Action/ActionView.cpp @@ -317,7 +317,7 @@ QObject *ActionView::showTriggerObjectBrowser(const QPoint &point) if (!m_objectsModel) { m_objectsModel = new ObjectListModel(g_StudioApp.GetCore(), - GetDoc()->GetActiveRootInstance(), this); + GetDoc()->GetSceneInstance(), this); } if (!m_triggerObjectBrowser) @@ -348,7 +348,7 @@ QObject *ActionView::showTargetObjectBrowser(const QPoint &point) if (!m_objectsModel) { m_objectsModel = new ObjectListModel(g_StudioApp.GetCore(), - GetDoc()->GetActiveRootInstance(), this); + GetDoc()->GetSceneInstance(), this); } if (!m_targetObjectBrowser) |