Revision: 23823
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23823
Author: blendix
Date: 2009-10-14 11:08:48 +0200 (Wed, 14 Oct 2009)
Log Message:
-----------
Bugfix: uv editor transform operators were not working anymore
after the recent retopo/snap commit.
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform_generics.c
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2009-10-14 08:24:40 UTC (rev 23822)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2009-10-14 09:08:48 UTC (rev 23823)
@@ -617,6 +617,17 @@
}
}
}
+ 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 @@
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;
+ 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);
- 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);
- }
+ 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 @@
}
}
- if(t->spacetype==SPACE_VIEW3D && ((View3D*)t->view)->drawtype
== OB_SHADED)
+ if(((View3D*)t->view)->drawtype == OB_SHADED)
reshadeall_displist(t->scene);
}
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
