diff options
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Operators.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/Operators.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 7ca3e5c1496..1ad8901fa7b 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -32,9 +32,12 @@ #include "Operators.h" #include "Canvas.h" #include "Stroke.h" +#include "CurveIterators.h" #include "BKE_global.h" +namespace Freestyle { + LIB_STROKE_EXPORT Operators::I1DContainer Operators::_current_view_edges_set; LIB_STROKE_EXPORT Operators::I1DContainer Operators::_current_chains_set; LIB_STROKE_EXPORT Operators::I1DContainer *Operators::_current_set = NULL; @@ -79,7 +82,6 @@ int Operators::select(UnaryPredicate1D& pred) return 0; } - int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& pred, UnaryFunction1D_void& modifier) { if (_current_view_edges_set.empty()) @@ -140,7 +142,6 @@ error: return -1; } - int Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it, UnaryPredicate1D& pred) { if (_current_view_edges_set.empty()) @@ -659,8 +660,6 @@ error: return -1; } -#include "CurveIterators.h" - // Internal function static int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate1D& pred, float sampling, Operators::I1DContainer& newChains, Operators::I1DContainer& splitted_chains) @@ -814,7 +813,6 @@ int Operators::recursiveSplit(UnaryFunction0D<double>& func, UnaryPredicate1D& p return 0; } - // recursive split with pred 0D static int __recursiveSplit(Chain *_curve, UnaryFunction0D<double>& func, UnaryPredicate0D& pred0d, UnaryPredicate1D& pred, float sampling, @@ -1205,7 +1203,6 @@ inline int applyShading(Stroke& stroke, vector<StrokeShader*>& shaders) return 0; } - int Operators::create(UnaryPredicate1D& pred, vector<StrokeShader*> shaders) { //Canvas* canvas = Canvas::getInstance(); @@ -1272,3 +1269,5 @@ void Operators::reset() _current_set = &_current_view_edges_set; _current_strokes_set.clear(); } + +} /* namespace Freestyle */ |