* Implemented Python's iterator protocol in Interface0DIterator and

orientedViewEdgeIterator.

* Simplified Python-related error handling in C++ class definitions.
The definitions of the following C++ methods were simplified and most
code segments using the C/Python API were moved to Director.cpp.

  ChainingIterator::init()
  ChainingIterator::traverse()
  UnaryPredicate0D::operator()()
  UnaryPredicate1D::operator()()
  BinaryPredicate0D::operator()()
  BinaryPredicate1D::operator()()
  UnaryFunction0D::operator()()
  UnaryFunction1D::operator()()
  StrokeShader.shade()

* Moved part of the introspection-based automatic type conversion code
from BPy_Interface0DIterator.cpp and Director.cpp to BPy_Convert.cpp
for the sake of better code organization.

* Fixed an uninitialized member in StrokeVertexIterator___init__().

1 files changed, 1 insertions, 10 deletions

diff --git a/source/blender/freestyle/intern/stroke/StrokeShader.h b/source/blender/freestyle/intern/stroke/StrokeShader.h
index 031b7cc8acb..63185438e91 100755
--- a/source/blender/freestyle/intern/stroke/StrokeShader.h
+++ b/source/blender/freestyle/intern/stroke/StrokeShader.h
@@ -116,16 +116,7 @@ public:
    *    as Color, Thickness, Geometry...)
    */
   virtual int shade(Stroke& ioStroke) const {
-	string name( py_ss ? PyString_AsString(PyObject_CallMethod(py_ss, "getName", "")) : getName() );
-	
-	if( py_ss && PyObject_HasAttrString(py_ss, "shade") ) {
-		if (Director_BPy_StrokeShader_shade(py_ss, ioStroke) < 0) {
-			return -1;
-		}
-	} else {
-		cerr << "Warning: " << name << " shade() method not implemented" << endl;
-	}
-	return 0;
+	return Director_BPy_StrokeShader_shade( const_cast<StrokeShader *>(this), ioStroke );
   }
 
 };