diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-09-28 06:05:19 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-09-28 06:17:31 +0400 |
| commit | c900cd3bd8ab060f34e303ae6da7edf6994223d9 (patch) | |
| tree | c44c7d9b448e1b4525128ff2a031794f2fbc60ac /source/blender/freestyle/intern/stroke/Operators.cpp | |
| parent | 21825c4359159798da2b0b25da8ef1131c7399d1 (diff) | |
Freestyle: Expose the Operators.reset() function to Python.
The Operators.reset function is exposed to the Freestyle Python API, which makes
it possible to combine multiple style modules into one file.
Differential revision: https://developer.blender.org/D802
Author: flokkievids (Folkert de Vries)
Reviewed by: kjym3 (Tamito Kajiyama)
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Operators.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/Operators.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 427994f80f1..87ba34e8f42 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -1242,7 +1242,7 @@ error: return -1; } -void Operators::reset() +void Operators::reset(bool removeStrokes) { ViewMap *vm = ViewMap::getInstance(); if (!vm) { @@ -1253,11 +1253,7 @@ void Operators::reset() for (I1DContainer::iterator it = _current_chains_set.begin(); it != _current_chains_set.end(); ++it) delete *it; _current_chains_set.clear(); -#if 0 - _current_view_edges_set.insert(_current_view_edges_set.begin(), - vm->ViewEdges().begin(), - vm->ViewEdges().end()); -#else + ViewMap::viewedges_container& vedges = vm->ViewEdges(); ViewMap::viewedges_container::iterator ve = vedges.begin(), veend = vedges.end(); for (; ve != veend; ++ve) { @@ -1265,9 +1261,9 @@ void Operators::reset() continue; _current_view_edges_set.push_back(*ve); } -#endif _current_set = &_current_view_edges_set; - _current_strokes_set.clear(); + if (removeStrokes) + _current_strokes_set.clear(); } } /* namespace Freestyle */ |