soc-2008-mxcurioni: SWIG removal - completed SVertex and CurvePoint classes migration. Stabilized a lot of the code for C++ -> Python conversion. Added the correct rich comparison operator and tested it. Corrected 'dupplicate' typo and changde to __copy__ for Python API.

From now on, when a set should be output (PySet_Type), it is given as a list (PyList_Type). The reason is that it doesn't really matter what we bring back to the Python interpreter. The set is guaranteed in memory on the C++ side.

For the CurvePoint class, the userdata variable is not yet ported (and will probably available as a list or a dictionary). The CurvePoint implementation works except for the initialization from other CurvePoints: somehow, the inner variables don't seem to be correctly handled. I do not know if it is a bug in Freestyle or if the CurvePoint object's state is correct for my test case. CurvePoint needs more testing.

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/freestyle/intern/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index 958c0545d6d..c6a1763eec6 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
@@ -206,7 +206,7 @@ public:
   }
 
   /*! Cloning method. */
-  virtual SVertex * dupplicate() {
+  virtual SVertex * duplicate() {
     SVertex *clone = new SVertex(*this);
     return clone;
   }
@@ -455,7 +455,7 @@ public:
   /*! Destructor */
   virtual ~FEdge() {}
   /*! Cloning method. */
-  virtual FEdge* dupplicate()
+  virtual FEdge* duplicate()
   {
     FEdge *clone = new FEdge(*this);
     return clone;
@@ -805,7 +805,7 @@ public:
   /*! Destructor. */
   virtual ~FEdgeSharp() {}
   /*! Cloning method. */
-  virtual FEdge* dupplicate(){
+  virtual FEdge* duplicate(){
     FEdge *clone = new FEdgeSharp(*this);
     return clone;
   }
@@ -886,7 +886,7 @@ public:
   /*! Destructor. */
   virtual ~FEdgeSmooth() {}
   /*! Cloning method. */
-  virtual FEdge* dupplicate(){
+  virtual FEdge* duplicate(){
     FEdge *clone = new FEdgeSmooth(*this);
     return clone;
   }
@@ -980,7 +980,7 @@ public:
         e!=eend;
         e++)
       {
-        FEdge *newe = (*e)->dupplicate();
+        FEdge *newe = (*e)->duplicate();
         _edgesList.push_back(newe);
       } 
 
@@ -1053,7 +1053,7 @@ public:
       }  
   }
   /*! Cloning method. */
-  virtual SShape * dupplicate()
+  virtual SShape * duplicate()
   {
     SShape *clone = new SShape(*this);
     return clone;