svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Wed, 11 May 2011 00:19:13 +0000 (00:19 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 11 May 2011 00:19:13 +0000 (00:19 +0000)
1  2 
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/object.c
source/blender/editors/curve/editcurve.c
source/blender/editors/object/object_transform.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/gpu/intern/gpu_draw.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/strand.c

index 634a99f1dd63b9e1981e53caf66af3af3b1d630a,20d7ea21d5cf90de4f92b5f6e8ee4521b4d40b43..2919c65211fd272ac6da205409ebbc0f2ddea82e
@@@ -529,14 -419,11 +529,14 @@@ int ED_uvedit_minmax(Scene *scene, Imag
        return sel;
  }
  
- int ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[3])
static int ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[3])
  {
 -      EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
 -      EditFace *efa;
 -      MTFace *tf;
 +      BMEditMesh *em= ((Mesh*)obedit->data)->edit_btmesh;
 +      BMFace *efa;
 +      BMLoop *l;
 +      BMIter iter, liter;
 +      MTexPoly *tf;
 +      MLoopUV *luv;
        unsigned int sel= 0;
  
        zero_v3(co);
Simple merge