svn merge ^/trunk/blender -r40382:r40389
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:43:06 +0000 (06:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:43:06 +0000 (06:43 +0000)
1  2 
source/blender/editors/transform/transform_conversions.c
source/blender/editors/uvedit/uvedit_ops.c

index fdcb67c0bb16df3a3c19777f5a0e9ee7a0d5bb3f,06abd3a4636b050677a6f3c0f0f9d7583c069b93..8074d6469bc3dc2b56e1f95782650e66ad8d4744
@@@ -2061,17 -1977,13 +2061,17 @@@ static void createTransEditVerts(bConte
  {
        ToolSettings *ts = CTX_data_tool_settings(C);
        TransData *tob = NULL;
 -      EditMesh *em = ((Mesh *)t->obedit->data)->edit_mesh;
 -      EditVert *eve;
 -      EditVert *eve_act = NULL;
 +      BMEditMesh *em = ((Mesh *)t->obedit->data)->edit_btmesh;
 +      BMesh *bm = em->bm;
 +      BMVert *eve;
 +      BMIter iter;
 +      BMVert *eve_act = NULL;
        float *mappedcos = NULL, *quats= NULL;
        float mtx[3][3], smtx[3][3], (*defmats)[3][3] = NULL, (*defcos)[3] = NULL;
 -      int count=0, countsel=0, a, totleft;
 +      float *dists=NULL;
 +      int count=0, countsel=0, a, totleft, *selstate = NULL;
 +      BLI_array_declare(selstate);
-       int propmode = t->flag & (T_PROP_EDIT|T_PROP_CONNECTED);
+       int propmode = (t->flag & T_PROP_EDIT) ? (t->flag & (T_PROP_EDIT | T_PROP_CONNECTED)) : 0;
        int mirror = 0;
        short selectmode = ts->selectmode;