diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-10-15 23:38:45 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-10-15 23:38:45 +0400 |
commit | 94711098e4bc0f2c95c11c0cdb0766857872f87a (patch) | |
tree | 53720f53d984af8d1adec861b8f0da6b6fe9aa95 /source/blender/freestyle/intern | |
parent | 3c7d54b38a137f5de9af716cfcc0672facf202ad (diff) |
* 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.
Diffstat (limited to 'source/blender/freestyle/intern')
20 files changed, 23 insertions, 24 deletions
diff --git a/source/blender/freestyle/intern/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp index b090a3df67f..325126b4b96 100755 --- a/source/blender/freestyle/intern/geometry/FastGrid.cpp +++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp @@ -59,4 +59,4 @@ void FastGrid::fillCell(const Vec3u& p, Cell& cell) { assert(p[1]<_cells_nb[1]); assert(p[2]<_cells_nb[2]); _cells[_cells_nb[0] * (p[2] * _cells_nb[1] + p[1]) + p[0]] = &cell; -}
\ No newline at end of file +} 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] )) ); diff --git a/source/blender/freestyle/intern/rendering/GLBlendEquation.cpp b/source/blender/freestyle/intern/rendering/GLBlendEquation.cpp index 5dc0985aa53..2cbd003c58e 100644 --- a/source/blender/freestyle/intern/rendering/GLBlendEquation.cpp +++ b/source/blender/freestyle/intern/rendering/GLBlendEquation.cpp @@ -6,4 +6,4 @@ void FRS_glBlendEquation(GLenum mode) { } else if ( glBlendEquationEXT ) { glBlendEquationEXT(mode); } -}
\ No newline at end of file +} diff --git a/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h index dd6412b1bb7..2b9314f3701 100644 --- a/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h +++ b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h @@ -20,4 +20,4 @@ public: VISIT_DECL(IndexedFaceSet) }; -#endif // GL_FREE_MEMORY_H_
\ No newline at end of file +#endif // GL_FREE_MEMORY_H_ diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h index 76ccf465d38..cdd6fa83048 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeCamera.h +++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h @@ -189,4 +189,4 @@ public: }; -#endif // NODE_CAMERA_H_
\ No newline at end of file +#endif // NODE_CAMERA_H_ diff --git a/source/blender/freestyle/intern/scene_graph/Rep.cpp b/source/blender/freestyle/intern/scene_graph/Rep.cpp index 520d3c41e2e..84ad2c2a966 100755 --- a/source/blender/freestyle/intern/scene_graph/Rep.cpp +++ b/source/blender/freestyle/intern/scene_graph/Rep.cpp @@ -1 +1 @@ -#include "Rep.h"
\ No newline at end of file +#include "Rep.h" diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp b/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp index 9cfb9d40d24..da9c94930bd 100755 --- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp +++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp @@ -1 +1 @@ -#include "SceneVisitor.h"
\ No newline at end of file +#include "SceneVisitor.h" diff --git a/source/blender/freestyle/intern/stroke/StrokeIO.cpp b/source/blender/freestyle/intern/stroke/StrokeIO.cpp index 7f540939fa1..903a198adc2 100755 --- a/source/blender/freestyle/intern/stroke/StrokeIO.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeIO.cpp @@ -52,4 +52,4 @@ ostream& operator<<(ostream& out, const Stroke& iStroke){ out << *(*v) << endl; } return out; -}
\ No newline at end of file +} diff --git a/source/blender/freestyle/intern/stroke/StrokeIO.h b/source/blender/freestyle/intern/stroke/StrokeIO.h index 42b99420f4a..c99704c3b37 100755 --- a/source/blender/freestyle/intern/stroke/StrokeIO.h +++ b/source/blender/freestyle/intern/stroke/StrokeIO.h @@ -44,4 +44,4 @@ LIB_STROKE_EXPORT ostream& operator<<(ostream& out, const Stroke& iStroke); -#endif // STROKEIO_H
\ No newline at end of file +#endif // STROKEIO_H diff --git a/source/blender/freestyle/intern/system/BaseObject.cpp b/source/blender/freestyle/intern/system/BaseObject.cpp index 21d8a77b268..0cf1c917195 100755 --- a/source/blender/freestyle/intern/system/BaseObject.cpp +++ b/source/blender/freestyle/intern/system/BaseObject.cpp @@ -1 +1 @@ -#include "BaseObject.h"
\ No newline at end of file +#include "BaseObject.h" diff --git a/source/blender/freestyle/intern/system/Iterator.cpp b/source/blender/freestyle/intern/system/Iterator.cpp index b3b0de9563d..67acc893589 100644 --- a/source/blender/freestyle/intern/system/Iterator.cpp +++ b/source/blender/freestyle/intern/system/Iterator.cpp @@ -1 +1 @@ -#include "Iterator.h"
\ No newline at end of file +#include "Iterator.h" diff --git a/source/blender/freestyle/intern/system/Iterator.h b/source/blender/freestyle/intern/system/Iterator.h index ce6badd543a..1801c1e3b2f 100644 --- a/source/blender/freestyle/intern/system/Iterator.h +++ b/source/blender/freestyle/intern/system/Iterator.h @@ -38,4 +38,4 @@ public: }; -#endif // ITERATOR_H
\ No newline at end of file +#endif // ITERATOR_H |