griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

BMesh branch

Browse Source 
------------
Correct problems with edgetag_context_set(), edgetag_shortest_path(),
minmax_tface(); parameters were missing or of incorrect type.

Joseph: please review these changes.
This commit is contained in:
Ken Hughes
2010-03-11 19:14:35 +00:00
parent fbfbcb40b7
commit 388e08af62
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/include/ED_mesh.h
View File

@@ -268,7 +268,7 @@ int face_select(struct bContext *C, struct Object *ob, short mval[2], int extend
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 */

2
source/blender/editors/mesh/bmesh_select.c
View File

@@ -1242,7 +1242,7 @@ static void mouse_mesh_shortest_path(bContext *C, short mval[2])
}
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);

4
source/blender/editors/mesh/editface.c
View File

@@ -349,7 +349,7 @@ void select_linked_tfaces_with_seams(int mode, Mesh *me, unsigned int index)
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 @@ int edgetag_shortest_path(Scene *scene, BMEditMesh *em, BMEdge *source, BMEdge *
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;

4
source/blender/editors/mesh/mesh_intern.h
View File

@@ -91,8 +91,8 @@ void EDBM_stats_update(struct BMEditMesh *em);
/* ******************** 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 */