diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-05-11 16:35:13 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-05-14 07:44:19 +0000 |
| commit | a6341054783f54c03f190477c95b07f3b33ac777 (patch) | |
| tree | 909a8f805f8f770f9a7037c01a7c49bf55d8de5d /src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp | |
| parent | d8951711c3f5a2f52c24715f15f9a446ca7ae755 (diff) | |
Forbid inserting master objects into non-master objects
Task-number: QT3DS-1552
Change-Id: I26cd0d6efb591e435171d275685ecef335e5ec3d
Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp')
| -rw-r--r-- | src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp index 91dab710..892fc721 100644 --- a/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp +++ b/src/Authoring/Studio/Palettes/TimelineGraphicsView/RowMover.cpp @@ -209,6 +209,9 @@ void RowMover::updateTargetRow(const QPointF &scenePos) valid = false; // not moving a material row outside its parent } + if (m_sourceRow && m_sourceRow->isMaster() && !m_insertionParent->isMaster()) + valid = false; // don't insert master slide object into non-master slide object + if (valid) { // calc insertion index int index = rowInsert1->index() + 1; |