soc-2008-mxcurioni: Made crucial corrections to stabilize the system. Most of the original styles are supported: stroke attributes are correctly taken into account, Python shaders are supported. Added SamplingShader.

4 files changed, 8 insertions, 9 deletions

diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index 7fce126d309..cb2e30f841a 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -167,14 +167,14 @@ PyObject * CurvePoint___copy__( BPy_CurvePoint *self ) {
 
 PyObject * CurvePoint_A( BPy_CurvePoint *self ) {
 	if( SVertex *A = self->cp->A() )
-		return BPy_SVertex_from_SVertex( *A );
+		return BPy_SVertex_from_SVertex_ptr( A );
 
 	Py_RETURN_NONE;
 }
 
 PyObject * CurvePoint_B( BPy_CurvePoint *self ) {
 	if( SVertex *B = self->cp->B() )
-		return BPy_SVertex_from_SVertex( *B );
+		return BPy_SVertex_from_SVertex_ptr( B );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
index 3616e69447f..1e2d34c2767 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
@@ -183,8 +183,7 @@ PyObject * StrokeVertex_getPoint( BPy_StrokeVertex *self ) {
 }
 
 PyObject * StrokeVertex_attribute( BPy_StrokeVertex *self ) {
-	StrokeAttribute sa( self->sv->attribute() );
-	return BPy_StrokeAttribute_from_StrokeAttribute( sa );
+	return BPy_StrokeAttribute_from_StrokeAttribute_ptr( &(self->sv->attribute()) );
 }
 
 PyObject * StrokeVertex_curvilinearAbscissa( BPy_StrokeVertex *self ) {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
index 206674a20a5..74c91856bbd 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
@@ -165,7 +165,7 @@ PyObject * NonTVertex_castToNonTVertex( BPy_NonTVertex *self ) {
 
 PyObject * NonTVertex_svertex( BPy_NonTVertex *self ) {
 	if( self->ntv->svertex() ){
-		return BPy_SVertex_from_SVertex(*( self->ntv->svertex() ));
+		return BPy_SVertex_from_SVertex_ptr( self->ntv->svertex() );
 	}
 
 	Py_RETURN_NONE;
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index ab8bb72604c..83ec27818fa 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
@@ -155,7 +155,7 @@ PyObject * TVertex_castToTVertex( BPy_TVertex *self ) {
 
 PyObject * TVertex_frontSVertex( BPy_TVertex *self ) {
 	if( self->tv->frontSVertex() ){
-		return BPy_SVertex_from_SVertex(*( self->tv->frontSVertex() ));
+		return BPy_SVertex_from_SVertex_ptr( self->tv->frontSVertex() );
 	}
 
 	Py_RETURN_NONE;
@@ -163,7 +163,7 @@ PyObject * TVertex_frontSVertex( BPy_TVertex *self ) {
 
 PyObject * TVertex_backSVertex( BPy_TVertex *self ) {
 	if( self->tv->backSVertex() ){
-		return BPy_SVertex_from_SVertex(*( self->tv->backSVertex() ));
+		return BPy_SVertex_from_SVertex_ptr( self->tv->backSVertex() );
 	}
 
 	Py_RETURN_NONE;
@@ -219,7 +219,7 @@ PyObject * TVertex_getSVertex( BPy_TVertex *self, PyObject *args) {
 
 	SVertex *sv = self->tv->getSVertex( ((BPy_FEdge *) py_fe)->fe );
 	if( sv ){
-		return BPy_SVertex_from_SVertex(*( sv ));
+		return BPy_SVertex_from_SVertex_ptr( sv );
 	}
 
 	Py_RETURN_NONE;
@@ -235,7 +235,7 @@ PyObject * TVertex_mate( BPy_TVertex *self, PyObject *args) {
 
 	ViewEdge *ve = self->tv->mate( ((BPy_ViewEdge *) py_ve)->ve );
 	if( ve ){
-		return BPy_ViewEdge_from_ViewEdge(*( ve ));
+		return BPy_ViewEdge_from_ViewEdge_ptr( ve );
 	}
 
 	Py_RETURN_NONE;