summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes/Timeline
diff options
context:
space:
mode:
authorKaj Grönholm <kaj.gronholm@qt.io>2018-05-14 11:39:48 +0300
committerKaj Grönholm <kaj.gronholm@qt.io>2018-05-14 12:19:56 +0000
commitfcc48f22f88289c108c93dbd507cd95766b22623 (patch)
tree32c85c36ec5c8371329e75565b7b928c8e19471e /src/Authoring/Studio/Palettes/Timeline
parentb5146f527801d1a25c87ed57e12fbf7c4beb33a7 (diff)
Implement timeline onChildRemoved
Fixes material duplication when changed as previous material is removed. Also fix bar color after delete -> undo. Task-number: QT3DS-1631 Change-Id: I7d49586138edbdbfad2f9770ffb498d36af40da9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/Timeline')
-rw-r--r--src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
index 237a6ff9..49db6229 100644
--- a/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
+++ b/src/Authoring/Studio/Palettes/Timeline/Bindings/Qt3DSDMTimelineTimebar.h
@@ -83,7 +83,6 @@ public:
void ChangeTime(long inTime, bool inSetStart) override;
void CommitTimeChange() override;
void RollbackTimeChange() override;
- // TODO: Can be removed with new timeline
::CColor GetTimebarColor() override { return m_Color; }
Q3DStudio::CString GetTimebarComment() override { return m_Comment; }
void SetTimebarComment(const Q3DStudio::CString &inComment) override;