diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-09-10 16:26:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-09-10 16:26:36 +0400 |
commit | e8a808da24e0c791a557aae7e3930550982f45c7 (patch) | |
tree | 804b01e82ee92e2081aa5aa5b56105342e021fdb /source/blender/src/transform_generics.c | |
parent | 0e3460dd1b6b9521f1833998b63d7753639c5339 (diff) |
UV Editing is now done in editmode rather then UV/Face Select mode.
Notes
* you cant edit UV's in the image window in "UV Face Select" mode. (removed UV from the name)
* going into Face Select mode no longer adds UV's and does not need UV's to work.
* The UV Calculation menu is now in editmode (Alt+W)
Todo..
* Image replace - partly broken in stable also.
* Rotate/Mirror UV/VCol are still only in Face Select mode.
* Hide/Reveal is not quite right, (issue with editmode flushing)
Diffstat (limited to 'source/blender/src/transform_generics.c')
-rw-r--r-- | source/blender/src/transform_generics.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c index 8e999e8bb31..33ced3b292c 100644 --- a/source/blender/src/transform_generics.c +++ b/source/blender/src/transform_generics.c @@ -218,18 +218,25 @@ void recalcData(TransInfo *t) if (G.obedit) { if (G.obedit->type == OB_MESH) { - retopo_do_all(); - - /* mirror modifier clipping? */ - if(t->state != TRANS_CANCEL) - clipMirrorModifier(t, G.obedit); - - if(G.scene->toolsettings->editbutflag & B_MESH_X_MIRROR) - editmesh_apply_to_mirror(t); + if(t->spacetype==SPACE_IMAGE) { + flushTransUVs(t); + if (G.sima->flag & SI_LIVE_UNWRAP) + unwrap_lscm_live_re_solve(); + } else { - DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); /* sets recalc flags */ - - recalc_editnormals(); + retopo_do_all(); + + /* mirror modifier clipping? */ + if(t->state != TRANS_CANCEL) + clipMirrorModifier(t, G.obedit); + + if(G.scene->toolsettings->editbutflag & B_MESH_X_MIRROR) + editmesh_apply_to_mirror(t); + + DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA); /* sets recalc flags */ + + recalc_editnormals(); + } } else if ELEM(G.obedit->type, OB_CURVE, OB_SURF) { Nurb *nu= editNurb.first; @@ -314,11 +321,6 @@ void recalcData(TransInfo *t) else where_is_pose(ob); } - else if(t->spacetype==SPACE_IMAGE) { - flushTransUVs(t); - if (G.sima->flag & SI_LIVE_UNWRAP) - unwrap_lscm_live_re_solve(); - } else { for(base= FIRSTBASE; base; base= base->next) { Object *ob= base->object; |