[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27424] branches/bmesh/blender/source/ blender/editors: BMesh branch

[Ken Hughes]

Revision: 27424
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27424
Author:   khughes
Date:     2010-03-11 20:14:35 +0100 (Thu, 11 Mar 2010)

Log Message:
-----------
BMesh branch
------------
Correct problems with edgetag_context_set(), edgetag_shortest_path(),
minmax_tface(); parameters were missing or of incorrect type.

Joseph: please review these changes.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
    branches/bmesh/blender/source/blender/editors/mesh/editface.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h

Modified: branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/include/ED_mesh.h	2010-03-11 19:02:52 UTC (rev 27423)
+++ branches/bmesh/blender/source/blender/editors/include/ED_mesh.h	2010-03-11 19:14:35 UTC (rev 27424)
@@ -268,7 +268,7 @@
 void face_borderselect(struct bContext *C, struct Object *ob, struct rcti *rect, int select, int extend);
 void selectall_tface(struct Object *ob, int action);
 void select_linked_tfaces(struct bContext *C, struct Object *ob, short mval[2], int mode);
-int minmax_tface(struct Object *ob, float *min, float *max);
+int minmax_tface(struct Scene *sce, float *min, float *max);
 
 /* object_vgroup.c */
 

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c	2010-03-11 19:02:52 UTC (rev 27423)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c	2010-03-11 19:14:35 UTC (rev 27424)
@@ -1242,7 +1242,7 @@
 		}
 		if (path==0) {
 			int act = (edgetag_context_check(vc.scene, eed)==0);
-			edgetag_context_set(vc.scene, eed, act); /* switch the edge option */
+			edgetag_context_set(em, vc.scene, eed, act); /* switch the edge option */
 		}
 		
 		EM_selectmode_flush(em);

Modified: branches/bmesh/blender/source/blender/editors/mesh/editface.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/editface.c	2010-03-11 19:02:52 UTC (rev 27423)
+++ branches/bmesh/blender/source/blender/editors/mesh/editface.c	2010-03-11 19:14:35 UTC (rev 27424)
@@ -349,7 +349,7 @@
 					mf->flag &= ~ME_FACE_SEL;
 		}
 		else {
-			for(a=0, mf=me->mface; a<me->totpoly; a++, mf++)
+			for(a=0, mf=me->mpoly; a<me->totpoly; a++, mf++)
 				if(linkflag[a])
 					mf->flag |= ME_FACE_SEL;
 		}
@@ -680,7 +680,7 @@
 
 		mednum = BMINDEX_GET(target);
 		do {
-			eed = EDBM_get_edge_for_index(eed, mednum);
+			eed = EDBM_get_edge_for_index(em, mednum);
 			if (!edgetag_context_check(scene, eed)) {
 				allseams = 0;
 				break;

Modified: branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h	2010-03-11 19:02:52 UTC (rev 27423)
+++ branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h	2010-03-11 19:14:35 UTC (rev 27424)
@@ -91,8 +91,8 @@
 /* ******************** editface.c */
 
 int edgetag_context_check(Scene *scene, BMEdge *eed);
-void edgetag_context_set(Scene *scene, BMEdge *eed, int val);
-int edgetag_shortest_path(Scene *scene, BMEditMesh *em, EditEdge *source, EditEdge *target);
+void edgetag_context_set(BMEditMesh *em, Scene *scene, BMEdge *eed, int val);
+int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, BMEdge *target);
 
 /* ******************* editmesh.c */