[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43167] branches/bmesh/blender/source/ blender/bmesh/operators/mesh_conv.c: revert r43166

Campbell Barton ideasman42 at gmail.com
Thu Jan 5 14:16:39 CET 2012


Revision: 43167
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43167
Author:   campbellbarton
Date:     2012-01-05 13:16:31 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
revert r43166

merge -r43166:43165 .

the bug was infact caused by custom pointer update function not running, committing next 

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43166
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43166

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c

Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2012-01-05 12:58:29 UTC (rev 43166)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c	2012-01-05 13:16:31 UTC (rev 43167)
@@ -406,7 +406,7 @@
 	/* Object *ob = BMO_Get_Pnt(op, "object"); */
 	MLoop *mloop;
 	MPoly *mpoly;
-	MVert *mvert, *oldverts, *mv;
+	MVert *mvert, *oldverts;
 	MEdge *med, *medge;
 	BMVert *v, *eve;
 	BMEdge *e;
@@ -475,14 +475,13 @@
 	CustomData_add_layer(&me->pdata, CD_MPOLY, CD_ASSIGN, mpoly, me->totpoly);
 	
 	i = 0;
-	mv = mvert;
 	BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 		float *bweight = CustomData_bmesh_get(&bm->vdata, v->head.data, CD_BWEIGHT);
 
-		mv->bweight = bweight ? (char)((*bweight)*255) : 0;
+		mvert->bweight = bweight ? (char)((*bweight)*255) : 0;
 
-		copy_v3_v3(mv->co, v->co);
-		normal_float_to_short_v3(mv->no, v->no);
+		copy_v3_v3(mvert->co, v->co);
+		normal_float_to_short_v3(mvert->no, v->no);
 		
 		mvert->flag = BM_Vert_Flag_To_MEFlag(v);
 
@@ -492,7 +491,7 @@
 		CustomData_from_bmesh_block(&bm->vdata, &me->vdata, v->head.data, i);
 
 		i++;
-		mv++;
+		mvert++;
 
 		BM_CHECK_ELEMENT(bm, v);
 	}
@@ -613,7 +612,7 @@
 
 	if (dotess) {
 		me->totface= mesh_recalcTesselation(&me->fdata, &me->ldata, &me->pdata,
-		                                    mvert,
+		                                    me->mvert,
 		                                    me->totface, me->totloop, me->totpoly);
 	}
 



More information about the Bf-blender-cvs mailing list