diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-14 13:08:48 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-10-14 13:08:48 +0400 |
commit | daebfaaa49186886af5bef2b579baed7c4c6e93f (patch) | |
tree | 61b5b82607ca0a53a7a0c6848d4de9fe8f88e83b /source/blender/editors/transform/transform_generics.c | |
parent | 6f2146e84821396cecbc2f27c20868596bb8f13f (diff) |
Bugfix: uv editor transform operators were not working anymore
after the recent retopo/snap commit.
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 5fe9db3915f..11789651d01 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -617,6 +617,17 @@ void recalcData(TransInfo *t) } } } + else if (t->spacetype == SPACE_IMAGE) { + if (t->obedit && t->obedit->type == OB_MESH) { + SpaceImage *sima= t->sa->spacedata.first; + + flushTransUVs(t); + if(sima->flag & SI_LIVE_UNWRAP) + ED_uvedit_live_unwrap_re_solve(); + + DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA); + } + } else if (t->spacetype == SPACE_VIEW3D) { /* project */ @@ -652,27 +663,17 @@ void recalcData(TransInfo *t) if(la->editlatt->flag & LT_OUTSIDE) outside_lattice(la->editlatt); } else if (t->obedit->type == OB_MESH) { - if(t->spacetype==SPACE_IMAGE) { - SpaceImage *sima= t->sa->spacedata.first; - - flushTransUVs(t); - if(sima->flag & SI_LIVE_UNWRAP) - ED_uvedit_live_unwrap_re_solve(); - - DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA); - } else { - EditMesh *em = ((Mesh*)t->obedit->data)->edit_mesh; - /* mirror modifier clipping? */ - if(t->state != TRANS_CANCEL) { - clipMirrorModifier(t, t->obedit); - } - if((t->options & CTX_NO_MIRROR) == 0 && (t->flag & T_MIRROR)) - editmesh_apply_to_mirror(t); - - DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA); /* sets recalc flags */ - - recalc_editnormals(em); + EditMesh *em = ((Mesh*)t->obedit->data)->edit_mesh; + /* mirror modifier clipping? */ + if(t->state != TRANS_CANCEL) { + clipMirrorModifier(t, t->obedit); } + if((t->options & CTX_NO_MIRROR) == 0 && (t->flag & T_MIRROR)) + editmesh_apply_to_mirror(t); + + DAG_id_flush_update(t->obedit->data, OB_RECALC_DATA); /* sets recalc flags */ + + recalc_editnormals(em); } else if(t->obedit->type==OB_ARMATURE) { /* no recalc flag, does pose */ bArmature *arm= t->obedit->data; @@ -809,7 +810,7 @@ void recalcData(TransInfo *t) } } - if(t->spacetype==SPACE_VIEW3D && ((View3D*)t->view)->drawtype == OB_SHADED) + if(((View3D*)t->view)->drawtype == OB_SHADED) reshadeall_displist(t->scene); } } |