From 94711098e4bc0f2c95c11c0cdb0766857872f87a Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 15 Oct 2009 19:38:45 +0000 Subject: * Fixed compiler warnings concerning the lack of a newline at the end of a file. * Fixed compiler warnings due to an invalid argument to PyList_New(). NULL was used instead of 0 to create an empty list. --- source/blender/freestyle/intern/python/BPy_Freestyle.cpp | 2 +- source/blender/freestyle/intern/python/BPy_Id.cpp | 2 +- source/blender/freestyle/intern/python/BPy_SShape.cpp | 6 +++--- source/blender/freestyle/intern/python/BPy_ViewMap.cpp | 2 +- source/blender/freestyle/intern/python/BPy_ViewShape.cpp | 6 +++--- source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp | 2 +- .../freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp | 1 - .../python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp | 2 +- .../python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp | 2 +- 9 files changed, 12 insertions(+), 13 deletions(-) (limited to 'source/blender/freestyle/intern/python') diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp index 3f53619cdbd..bd5a5c8b38a 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp @@ -101,4 +101,4 @@ PyObject *Freestyle_Init( void ) #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/freestyle/intern/python/BPy_Id.cpp b/source/blender/freestyle/intern/python/BPy_Id.cpp index fbc22c2bffc..3c157230cff 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.cpp +++ b/source/blender/freestyle/intern/python/BPy_Id.cpp @@ -174,4 +174,4 @@ PyObject * Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid) { #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index 6538818d025..9ab2fbac096 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -177,7 +177,7 @@ PyObject * SShape_bbox( BPy_SShape *self ) { PyObject * SShape_getVertexList( BPy_SShape *self ) { - PyObject *py_vertices = PyList_New(NULL); + PyObject *py_vertices = PyList_New(0); vector< SVertex * > vertices = self->ss->getVertexList(); vector< SVertex * >::iterator it; @@ -191,7 +191,7 @@ PyObject * SShape_getVertexList( BPy_SShape *self ) { PyObject * SShape_getEdgeList( BPy_SShape *self ) { - PyObject *py_edges = PyList_New(NULL); + PyObject *py_edges = PyList_New(0); vector< FEdge * > edges = self->ss->getEdgeList(); vector< FEdge * >::iterator it; @@ -229,4 +229,4 @@ PyObject * SShape_setId( BPy_SShape *self , PyObject *args) { #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp index 7cbf2b5645c..19ba7469a24 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewMap.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewMap.cpp @@ -154,4 +154,4 @@ PyObject * ViewMap_setScene3dBBox( BPy_ViewMap *self , PyObject *args) { #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp index fcff1338ed1..46ac5e44d0d 100644 --- a/source/blender/freestyle/intern/python/BPy_ViewShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_ViewShape.cpp @@ -142,7 +142,7 @@ PyObject * ViewShape_sshape( BPy_ViewShape *self ) { PyObject * ViewShape_vertices( BPy_ViewShape *self ) { - PyObject *py_vertices = PyList_New(NULL); + PyObject *py_vertices = PyList_New(0); vector< ViewVertex * > vertices = self->vs->vertices(); vector< ViewVertex * >::iterator it; @@ -156,7 +156,7 @@ PyObject * ViewShape_vertices( BPy_ViewShape *self ) { PyObject * ViewShape_edges( BPy_ViewShape *self ) { - PyObject *py_edges = PyList_New(NULL); + PyObject *py_edges = PyList_New(0); vector< ViewEdge * > edges = self->vs->edges(); vector< ViewEdge * >::iterator it; @@ -260,4 +260,4 @@ PyObject * ViewShape_AddVertex( BPy_ViewShape *self , PyObject *args) { #ifdef __cplusplus } -#endif \ No newline at end of file +#endif diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index 36702799b49..dd204925936 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -133,7 +133,7 @@ PyObject * SVertex_normals( BPy_SVertex *self ) { PyObject *py_normals; set< Vec3r > normals; - py_normals = PyList_New(NULL); + py_normals = PyList_New(0); normals = self->sv->normals(); for( set< Vec3r >::iterator set_iterator = normals.begin(); set_iterator != normals.end(); set_iterator++ ) { diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp index a94b9ef5234..3e1a7c0f858 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp @@ -72,4 +72,3 @@ int GuidingLinesShader___init__( BPy_GuidingLinesShader* self, PyObject *args) #ifdef __cplusplus } #endif - \ No newline at end of file diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp index 66c22528e7f..5fcbff2c8de 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp @@ -139,7 +139,7 @@ PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorVie } return NULL; } - PyObject *list = PyList_New(NULL); + PyObject *list = PyList_New(0); for( unsigned int i = 0; i < self->uf0D_vectorviewshape->result.size(); i++) PyList_Append(list, BPy_ViewShape_from_ViewShape(*( self->uf0D_vectorviewshape->result[i] )) ); diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index d1ff993d0a0..4f5a5a731f9 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -166,7 +166,7 @@ PyObject * UnaryFunction1DVectorViewShape___call__( BPy_UnaryFunction1DVectorVie } return NULL; } - PyObject *list = PyList_New(NULL); + PyObject *list = PyList_New(0); for( unsigned int i = 0; i < self->uf1D_vectorviewshape->result.size(); i++) PyList_Append(list, BPy_ViewShape_from_ViewShape(*( self->uf1D_vectorviewshape->result[i] )) ); -- cgit v1.2.3