soc-2008-mxcurioni: made considerable changes to support cross-language polymorphism for UnaryFunction0D, Interface0D, Interface1D. Add to change UnaryFunction1D<void> to static UnaryFunction1D_void. Resolved namespace collision on the Image class (changed to FrsImage). There is greater support for style modules but somehow, some do not show anything yet (japanese_bigbrush being an example).

1 files changed, 2 insertions, 2 deletions

diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index fe1ac27b04e..39914cbef1a 100755
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -65,7 +65,7 @@ void Operators::select(UnaryPredicate1D& pred) {
 
 void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
 		      UnaryPredicate1D& pred,
-		      UnaryFunction1D<void>& modifier) {
+		      UnaryFunction1D_void& modifier) {
   if (_current_view_edges_set.empty())
     return;
 
@@ -137,7 +137,7 @@ void Operators::chain(ViewEdgeInternal::ViewEdgeIterator& it,
 
 //void Operators::bidirectionalChain(ViewEdgeIterator& it,
 //				   UnaryPredicate1D& pred,
-//				   UnaryFunction1D<void>& modifier) {
+//				   UnaryFunction1D_void& modifier) {
 //  if (_current_view_edges_set.empty())
 //    return;
 //