diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/freestyle/intern | |
parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/freestyle/intern')
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h index 956842580c5..4142117c361 100644 --- a/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h +++ b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h @@ -275,7 +275,7 @@ protected: { if (_Point != 0) { delete _Point; - _Point = 0; + _Point = 0; } if ((_currentn == _n - 1) && (_t == 1.0f)) { // we're setting the iterator to end diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h index 8e98cabd75b..a3a0b5cbaeb 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h +++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h @@ -555,9 +555,9 @@ public: // operators // operator corresponding to ++i. inline Self& operator++() - { - increment(); - return *this; + { + increment(); + return *this; } // operator corresponding to i++, i.e. which returns the value *and then* increments it. diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h index 5683b39fd28..601c208b137 100644 --- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h +++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h @@ -113,7 +113,7 @@ public: #endif inline void setRenderMonitor(RenderMonitor *iRenderMonitor) { - _pRenderMonitor = iRenderMonitor; + _pRenderMonitor = iRenderMonitor; } protected: |