[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41355] branches/bmesh/blender/source/ blender: macro -> math replacements, uncomment mirror funcs.

[Campbell Barton]

Revision: 41355
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41355
Author:   campbellbarton
Date:     2011-10-29 06:57:50 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
macro -> math replacements, uncomment mirror funcs.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/object/object_edit.c

Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2011-10-28 23:11:20 UTC (rev 41354)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2011-10-29 06:57:50 UTC (rev 41355)
@@ -154,7 +154,7 @@
 				float *co = CustomData_bmesh_get_n(&bm->vdata, v->head.data, 
 				                                   CD_SHAPEKEY, j);
 				if (co)
-					VECCOPY(co, ((float*)block->data)+3*i);
+					copy_v3_v3(co, ((float*)block->data)+3*i);
 			}
 		}
 	}
@@ -478,11 +478,8 @@
 
 		mvert->bweight = bweight ? (char)((*bweight)*255) : 0;
 
-		VECCOPY(mvert->co, v->co);
-
-		mvert->no[0] = (short) (v->no[0]*32767.0f);
-		mvert->no[1] = (short) (v->no[1]*32767.0f);
-		mvert->no[2] = (short) (v->no[2]*32767.0f);
+		copy_v3_v3(mvert->co, v->co);
+		normal_float_to_short_v3(mvert->no, v->no);
 		
 		mvert->flag = BMFlags_To_MEFlags(v);
 
@@ -614,7 +611,7 @@
 				test_index_face(mface, &me->fdata, i, 1);
 				
 				loops_to_corners(bm, me, i, f, ls, numTex, numCol);
-				VECCOPY(facenors, ls[0]->f->no);
+				copy_v3_v3(facenors, ls[0]->f->no);
 
 				mface++;
 				facenors += 3;
@@ -784,7 +781,7 @@
 					BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 						co = block==actkey ? eve->co : CustomData_bmesh_get_n(&bm->vdata, eve->head.data, CD_SHAPEKEY, j);
 						
-						VECCOPY(fp, co);
+						copy_v3_v3(fp, co);
 						fp += 3;
 					}
 					break;
@@ -838,23 +835,23 @@
 				if (*keyi >= 0 && *keyi < currkey->totelem) { // valid old vertex
 					if(currkey == actkey) {
 						if(actkey == me->key->refkey) {
-							VECCOPY(fp, mvert->co);
+							copy_v3_v3(fp, mvert->co);
 						}
 						else {
-							VECCOPY(fp, mvert->co);
+							copy_v3_v3(fp, mvert->co);
 							if(oldverts) {
-								VECCOPY(mvert->co, oldverts[*keyi].co);
+								copy_v3_v3(mvert->co, oldverts[*keyi].co);
 							}
 						}
 					}
 					else {
 						if(oldkey) {
-							VECCOPY(fp, oldkey + 3 * *keyi);
+							copy_v3_v3(fp, oldkey + 3 * *keyi);
 						}
 					}
 				}
 				else {
-					VECCOPY(fp, mvert->co);
+					copy_v3_v3(fp, mvert->co);
 				}
 				fp+= 3;
 				++i;

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2011-10-28 23:11:20 UTC (rev 41354)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2011-10-29 06:57:50 UTC (rev 41355)
@@ -4172,9 +4172,9 @@
 			mul_m4_m4m4(mat, OBACT->obmat, rv3d->viewmat); /* apply the view matrix to the object matrix */
 		else if (event == 2) { /* sort from cursor */
 			if( v3d && v3d->localvd ) {
-				VECCOPY(cur, v3d->cursor);
+				copy_v3_v3(cur, v3d->cursor);
 			} else {
-				VECCOPY(cur, scene->cursor);
+				copy_v3_v3(cur, scene->cursor);
 			}
 			invert_m4_m4(mat, OBACT->obmat);
 			mul_m4_v3(mat, cur);

Modified: branches/bmesh/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/object/object_edit.c	2011-10-28 23:11:20 UTC (rev 41354)
+++ branches/bmesh/blender/source/blender/editors/object/object_edit.c	2011-10-29 06:57:50 UTC (rev 41355)
@@ -332,12 +332,10 @@
 			MEM_freeN(me->edit_btmesh);
 			me->edit_btmesh= NULL;
 		}
-#if 0 //BMESH_TODO		
 		if(obedit->restore_mode & OB_MODE_WEIGHT_PAINT) {
 			mesh_octree_table(NULL, NULL, NULL, 'e');
 			mesh_mirrtopo_table(NULL, 'e');
 		}
-#endif
 	}
 	else if (obedit->type==OB_ARMATURE) {	
 		ED_armature_from_edit(obedit);