comparison Framework/Scene2DViewport/ViewportController.cpp @ 900:f9ae731fdc25 am-dev

Merge
author Alain Mazy <alain@mazy.be>
date Tue, 16 Jul 2019 12:42:31 +0200
parents 0c5201499af8
children 52b1c6ff10c5
comparison
equal deleted inserted replaced
897:9c2f6d6b9f4a 900:f9ae731fdc25
34 IViewport& viewport) 34 IViewport& viewport)
35 : IObservable(broker) 35 : IObservable(broker)
36 , undoStackW_(undoStackW) 36 , undoStackW_(undoStackW)
37 , canvasToSceneFactor_(0.0) 37 , canvasToSceneFactor_(0.0)
38 , viewport_(viewport) 38 , viewport_(viewport)
39 , scene_(viewport.GetScene())
40 { 39 {
41 } 40 }
42 41
43 boost::shared_ptr<UndoStack> ViewportController::GetUndoStack() 42 boost::shared_ptr<UndoStack> ViewportController::GetUndoStack()
44 { 43 {