archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

re-enable mirroring - it was commented in a few functions.

Browse Source
This commit is contained in:
Campbell Barton
2011-10-28 14:31:15 +00:00
parent a5bd610e70
commit e9429f45e5
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/armature/editarmature.c
View File

@@ -4524,8 +4524,7 @@ static void envelope_bone_weighting(Object *ob, Mesh *mesh, float (*verts)[3], i
/* for each vertex in the mesh */
for (i=0; i < mesh->totvert; i++) {
/*BMESH_TODO*/
iflip = 0; //(dgroupflip)? mesh_get_x_mirror_vert(ob, i): 0;
iflip = (dgroupflip)? mesh_get_x_mirror_vert(ob, i): 0;
/* for each skinnable bone */
for (j=0; j < numbones; ++j) {
@@ -4718,7 +4717,7 @@ static void add_verts_to_dgroups(ReportList *reports, Scene *scene, Object *ob,
}
/* only generated in some cases but can call anyway */
//BMESH_TODO mesh_octree_table(ob, NULL, NULL, 'e');
mesh_octree_table(ob, NULL, NULL, 'e');
/* free the memory allocated */
MEM_freeN(bonelist);

8
source/blender/editors/sculpt_paint/paint_vertex.c
View File

@@ -522,7 +522,7 @@ void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
dw->weight= paintweight;
if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */
int j= -1; //BMESH_TODO mesh_get_x_mirror_vert(ob, faceverts[i]);
int j= mesh_get_x_mirror_vert(ob, vidx);
if(j>=0) {
/* copy, not paint again */
if(vgroup_mirror != -1) {
@@ -1826,7 +1826,7 @@ static int set_wpaint(bContext *C, wmOperator *UNUSED(op)) /* toggle */
paint_init(&wp->paint, PAINT_CURSOR_WEIGHT_PAINT);
paint_cursor_start(C, weight_paint_poll);
//BMESH_TODO mesh_octree_table(ob, NULL, NULL, 's');
mesh_octree_table(ob, NULL, NULL, 's');
/* verify if active weight group is also active bone */
par= modifiers_isDeformedByArmature(ob);
@@ -1838,8 +1838,8 @@ static int set_wpaint(bContext *C, wmOperator *UNUSED(op)) /* toggle */
}
}
else {
//BMESH_TODO mesh_octree_table(NULL, NULL, NULL, 'e');
//BMESH_TODO mesh_mirrtopo_table(NULL, 'e');
mesh_octree_table(NULL, NULL, NULL, 'e');
mesh_mirrtopo_table(NULL, 'e');
}
WM_event_add_notifier(C, NC_SCENE|ND_MODE, scene);

6
source/blender/editors/transform/transform_conversions.c
View File

@@ -2265,8 +2265,6 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
}
/* Mirror? */
//BMESH_TODO
if( (mirror>0 && tob->iloc[0]>0.0f) || (mirror<0 && tob->iloc[0]<0.0f)) {
BMVert *vmir= EDBM_GetMirrorVert(em, eve); //t->obedit, em, eve, tob->iloc, a);
if(vmir && vmir != eve) {
@@ -5137,9 +5135,9 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
else if (t->obedit) {
if (t->obedit->type == OB_MESH)
{
// BMEditMesh *em = ((Mesh *)t->obedit->data)->edit_btmesh;
BMEditMesh *em = ((Mesh *)t->obedit->data)->edit_btmesh;
/* table needs to be created for each edit command, since vertices can move etc */
// BMESH_TODO mesh_octree_table(t->obedit, em, NULL, 'e');
mesh_octree_table(t->obedit, em, NULL, 'e');
}
}
else if ((t->flag & T_POSE) && (t->poseobj)) {

4
source/blender/editors/util/ed_util.c
View File

@@ -121,8 +121,8 @@ void ED_editors_exit(bContext *C)
}
/* global in meshtools... */
//BMESH_TODO mesh_octree_table(NULL, NULL, NULL, 'e');
//BMESH_TODO mesh_mirrtopo_table(NULL, 'e');
mesh_octree_table(NULL, NULL, NULL, 'e');
mesh_mirrtopo_table(NULL, 'e');
}