[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54968] trunk/blender/source/blender/bmesh /intern/bmesh_iterators_inline.h: Added typecasts to keep c++ from reporting errors

Gaia Clary gaia.clary at machinimatrix.org
Sat Mar 2 13:16:23 CET 2013


Revision: 54968
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54968
Author:   gaiaclary
Date:     2013-03-02 12:16:23 +0000 (Sat, 02 Mar 2013)
Log Message:
-----------
Added typecasts to keep c++ from reporting errors

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h	2013-03-02 12:05:25 UTC (rev 54967)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_iterators_inline.h	2013-03-02 12:16:23 UTC (rev 54968)
@@ -80,61 +80,61 @@
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__edge_of_vert_begin;
 			iter->step =  bmiter__edge_of_vert_step;
-			iter->vdata = data;
+			iter->vdata = (BMVert *)data;
 			break;
 		case BM_FACES_OF_VERT:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__face_of_vert_begin;
 			iter->step =  bmiter__face_of_vert_step;
-			iter->vdata = data;
+			iter->vdata = (BMVert *)data;
 			break;
 		case BM_LOOPS_OF_VERT:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__loop_of_vert_begin;
 			iter->step =  bmiter__loop_of_vert_step;
-			iter->vdata = data;
+			iter->vdata = (BMVert *)data;
 			break;
 		case BM_VERTS_OF_EDGE:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__vert_of_edge_begin;
 			iter->step =  bmiter__vert_of_edge_step;
-			iter->edata = data;
+			iter->edata = (BMEdge *)data;
 			break;
 		case BM_FACES_OF_EDGE:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__face_of_edge_begin;
 			iter->step =  bmiter__face_of_edge_step;
-			iter->edata = data;
+			iter->edata = (BMEdge *)data;
 			break;
 		case BM_VERTS_OF_FACE:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__vert_of_face_begin;
 			iter->step =  bmiter__vert_of_face_step;
-			iter->pdata = data;
+			iter->pdata = (BMFace *)data;
 			break;
 		case BM_EDGES_OF_FACE:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__edge_of_face_begin;
 			iter->step =  bmiter__edge_of_face_step;
-			iter->pdata = data;
+			iter->pdata = (BMFace *)data;
 			break;
 		case BM_LOOPS_OF_FACE:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__loop_of_face_begin;
 			iter->step =  bmiter__loop_of_face_step;
-			iter->pdata = data;
+			iter->pdata = (BMFace *)data;
 			break;
 		case BM_LOOPS_OF_LOOP:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__loops_of_loop_begin;
 			iter->step =  bmiter__loops_of_loop_step;
-			iter->ldata = data;
+			iter->ldata = (BMLoop *)data;
 			break;
 		case BM_LOOPS_OF_EDGE:
 			BLI_assert(data != NULL);
 			iter->begin = bmiter__loops_of_edge_begin;
 			iter->step =  bmiter__loops_of_edge_step;
-			iter->edata = data;
+			iter->edata = (BMEdge *)data;
 			break;
 		default:
 			/* should never happen */




More information about the Bf-blender-cvs mailing list