archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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.

Browse Source
This commit is contained in:
Maxime Curioni
2008-08-02 07:39:49 +00:00
parent 7565990db2
commit e385d69580
42 changed files with 758 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
View File

@@ -143,7 +143,7 @@ PyObject * AdjacencyIterator_getObject(BPy_AdjacencyIterator *self) {
ViewEdge *ve = self->a_it->operator*();
if( ve )
return BPy_ViewEdge_from_ViewEdge( *ve );
return BPy_ViewEdge_from_ViewEdge_ptr( ve );
Py_RETURN_NONE;
}

2
source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
View File

@@ -180,7 +180,7 @@ PyObject * ChainingIterator_getObject( BPy_ChainingIterator *self) {
ViewEdge *ve = self->c_it->operator*();
if( ve )
return BPy_ViewEdge_from_ViewEdge( *ve );
return BPy_ViewEdge_from_ViewEdge_ptr( ve );
Py_RETURN_NONE;
}

7
source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
View File

@@ -160,7 +160,12 @@ PyObject * SVertexIterator_u( BPy_SVertexIterator *self ) {
}
PyObject * SVertexIterator_getObject( BPy_SVertexIterator *self) {
return BPy_SVertex_from_SVertex( self->sv_it->operator*() );
SVertex *sv = self->sv_it->operator->();
if( sv )
return BPy_SVertex_from_SVertex_ptr( sv );
Py_RETURN_NONE;
}

6
source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
View File

@@ -155,7 +155,11 @@ PyObject * StrokeVertexIterator_castToInterface0DIterator( BPy_StrokeVertexItera
}
PyObject * StrokeVertexIterator_getObject( BPy_StrokeVertexIterator *self) {
return BPy_StrokeVertex_from_StrokeVertex( self->sv_it->operator*() );
StrokeVertex *sv = self->sv_it->operator->();
if( sv )
return BPy_StrokeVertex_from_StrokeVertex_ptr( sv );
Py_RETURN_NONE;
}

6
source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
View File

@@ -150,7 +150,7 @@ int ViewEdgeIterator___init__(BPy_ViewEdgeIterator *self, PyObject *args )
PyObject *ViewEdgeIterator_getCurrentEdge( BPy_ViewEdgeIterator *self ) {
if( self->ve_it->getCurrentEdge() )
return BPy_ViewEdge_from_ViewEdge(*( self->ve_it->getCurrentEdge() ));
return BPy_ViewEdge_from_ViewEdge_ptr( self->ve_it->getCurrentEdge() );
Py_RETURN_NONE;
}
@@ -171,7 +171,7 @@ PyObject *ViewEdgeIterator_setCurrentEdge( BPy_ViewEdgeIterator *self, PyObject
PyObject *ViewEdgeIterator_getBegin( BPy_ViewEdgeIterator *self ) {
if( self->ve_it->getBegin() )
return BPy_ViewEdge_from_ViewEdge(*( self->ve_it->getBegin() ));
return BPy_ViewEdge_from_ViewEdge_ptr( self->ve_it->getBegin() );
Py_RETURN_NONE;
}
@@ -216,7 +216,7 @@ PyObject * ViewEdgeIterator_getObject( BPy_ViewEdgeIterator *self) {
ViewEdge *ve = self->ve_it->operator*();
if( ve )
return BPy_ViewEdge_from_ViewEdge( *ve );
return BPy_ViewEdge_from_ViewEdge_ptr( ve );
Py_RETURN_NONE;
}