svn merge -r41329:41335 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 12:57:37 +0000 (12:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 28 Oct 2011 12:57:37 +0000 (12:57 +0000)
1  2 
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp

index 47dd0c50172135c253da1fbc33ba6e86c1ab61de,0a467142f749a7a4a43cd9a2d2d16dc17dfa2908..08eb3ab9cbb3fb37a40c60ade842d0be59b6b066
@@@ -544,14 -500,12 +544,14 @@@ static char *key_block_get_data(Key *ke
  
                        me= (Mesh*)key->from;
  
 -                      if(me->edit_mesh && me->edit_mesh->totvert == kb->totelem) {
 +                      if(me->edit_btmesh && me->edit_btmesh->bm->totvert == kb->totelem) {
                                a= 0;
 -                              co= MEM_callocN(sizeof(float)*3*me->edit_mesh->totvert, "key_block_get_data");
 +                              co= MEM_callocN(sizeof(float)*3*me->edit_btmesh->bm->totvert, "key_block_get_data");
  
 -                              for(eve=me->edit_mesh->verts.first; eve; eve=eve->next, a++)
 +                              BM_ITER(eve, &iter, me->edit_btmesh->bm, BM_VERTS_OF_MESH, NULL) {
-                                       VECCOPY(co[a], eve->co);
+                                       copy_v3_v3(co[a], eve->co);
 +                                      a++;
 +                              }
  
                                *freedata= (char*)co;
                                return (char*)co;
index 9f07b18c212b9814cdc77b3cdb4d05acf689017d,1b726cd90b39ae0ab6b59d6ae86769596df0dbb7..ed5c480643ccdaeeae54f6cd0dfe8cbbe58c6c9e
@@@ -282,12 -247,10 +282,12 @@@ static void make_trans_verts(Object *ob
                /* and now make transverts */
                if(tottrans) {
                        tv=transvmain= MEM_callocN(tottrans*sizeof(TransVert), "maketransverts");
 -
 -                      for(eve= em->verts.first; eve; eve= eve->next) {
 -                              if(eve->f1) {
 +              
 +                      a = 0;
 +                      BM_ITER(eve, &iter, bm, BM_VERTS_OF_MESH, NULL) {
 +                              if(BM_GetIndex(eve)) {
 +                                      BM_SetIndex(eve, a);
-                                       VECCOPY(tv->oldloc, eve->co);
+                                       copy_v3_v3(tv->oldloc, eve->co);
                                        tv->loc= eve->co;
                                        if(eve->no[0] != 0.0f || eve->no[1] != 0.0f ||eve->no[2] != 0.0f)
                                                tv->nor= eve->no; // note this is a hackish signal (ton)
@@@ -1009,7 -958,7 +1009,7 @@@ int minmax_verts(Object *obedit, float 
        
        tv= transvmain;
        for(a=0; a<tottrans; a++, tv++) {               
-               VECCOPY(vec, tv->maploc);
 -              copy_v3_v3(vec, tv->loc);
++              copy_v3_v3(vec, tv->maploc);
                mul_m3_v3(bmat, vec);
                add_v3_v3(vec, obedit->obmat[3]);
                add_v3_v3(centroid, vec);