From 41a98a59dc9c034509e397763eb45c6907e39b4e Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Fri, 15 Feb 2013 11:23:07 +0000 Subject: Fix compilation on linux (with gcc4.7). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without const, I had the following error: /home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp: In function ‘PyObject* ViewMap_scene_bbox_get(BPy_ViewMap*, void*)’: /home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp:120:54: error: invalid initialization of non-const reference of type ‘BBox >&’ from an rvalue of type ‘BBox >’ In file included from /home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp:3:0: /home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_Convert.h:81:12: error: in passing argument 1 of ‘PyObject* BPy_BBox_from_BBox(BBox >&)’ /home/i7deb64/blender-2.5-svn/__work__/freestyle/source/blender/freestyle/intern/python/BPy_ViewMap.cpp:121:1: warning: control reaches end of non-void function [-Wreturn-type] make[2]: *** [source/blender/freestyle/CMakeFiles/bf_freestyle.dir/intern/python/BPy_ViewMap.cpp.o] Erreur 1 --- source/blender/freestyle/intern/python/BPy_Convert.cpp | 2 +- source/blender/freestyle/intern/python/BPy_Convert.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/freestyle') diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp index 59cee23409f..00f2aa7e0c6 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.cpp +++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp @@ -281,7 +281,7 @@ PyObject * BPy_TVertex_from_TVertex( TVertex& tv ) { return py_tv; } -PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb ) { +PyObject * BPy_BBox_from_BBox(const BBox< Vec3r > &bb) { PyObject *py_bb = BBox_Type.tp_new( &BBox_Type, 0, 0 ); ((BPy_BBox *) py_bb)->bb = new BBox< Vec3r >( bb ); diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index 7089b4683f1..6082d70695e 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -78,7 +78,7 @@ PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D ); PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe ); PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv ); -PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb ); +PyObject * BPy_BBox_from_BBox(const BBox< Vec3r > &bb); PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp ); PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve ); PyObject * BPy_FEdge_from_FEdge( FEdge& fe ); -- cgit v1.2.3