diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/freestyle/intern/application | |
parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/freestyle/intern/application')
-rw-r--r-- | source/blender/freestyle/intern/application/AppCanvas.cpp | 4 | ||||
-rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp index f621f45ff77..aca725a0384 100644 --- a/source/blender/freestyle/intern/application/AppCanvas.cpp +++ b/source/blender/freestyle/intern/application/AppCanvas.cpp @@ -64,7 +64,7 @@ void AppCanvas::setViewer(AppView *iViewer) _pViewer = iViewer; } -int AppCanvas::width() const +int AppCanvas::width() const { return _pViewer->width(); } @@ -84,7 +84,7 @@ float AppCanvas::thickness() const return _pViewer->thickness(); } -BBox<Vec3r> AppCanvas::scene3DBBox() const +BBox<Vec3r> AppCanvas::scene3DBBox() const { return _pViewer->scene3DBBox(); } diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 200e3eb3b5b..b4c815f8ad0 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -471,11 +471,11 @@ void Controller::ComputeViewMap() // retrieve the 3D viewpoint and transformations information //---------------------------------------------------------- - // Save the viewpoint context at the view level in order + // Save the viewpoint context at the view level in order // to be able to restore it later: // Restore the context of view: - // we need to perform all these operations while the + // we need to perform all these operations while the // 3D context is on. Vec3f vp(UNPACK3(g_freestyle.viewpoint)); |