[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41342] branches/bmesh/blender/source/ blender/editors: re-enable mirroring - it was commented in a few functions.

Campbell Barton ideasman42 at gmail.com
Fri Oct 28 16:31:16 CEST 2011


Revision: 41342
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41342
Author:   campbellbarton
Date:     2011-10-28 14:31:15 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
re-enable mirroring - it was commented in a few functions.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/armature/editarmature.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/editors/util/ed_util.c

Modified: branches/bmesh/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/armature/editarmature.c	2011-10-28 14:19:04 UTC (rev 41341)
+++ branches/bmesh/blender/source/blender/editors/armature/editarmature.c	2011-10-28 14:31:15 UTC (rev 41342)
@@ -4524,8 +4524,7 @@
 
 	/* 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 @@
 	}
 
 	/* 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);

Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2011-10-28 14:19:04 UTC (rev 41341)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2011-10-28 14:31:15 UTC (rev 41342)
@@ -522,7 +522,7 @@
 						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 @@
 		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 @@
 		}
 	}
 	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);

Modified: branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c	2011-10-28 14:19:04 UTC (rev 41341)
+++ branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c	2011-10-28 14:31:15 UTC (rev 41342)
@@ -2265,8 +2265,6 @@
 				}
 
 				/* 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 @@
 	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)) {

Modified: branches/bmesh/blender/source/blender/editors/util/ed_util.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/util/ed_util.c	2011-10-28 14:19:04 UTC (rev 41341)
+++ branches/bmesh/blender/source/blender/editors/util/ed_util.c	2011-10-28 14:31:15 UTC (rev 41342)
@@ -121,8 +121,8 @@
 	}
 
 	/* 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');
 }
 
 




More information about the Bf-blender-cvs mailing list