Revision: 33714
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33714
Author: ton
Date: 2010-12-16 18:19:24 +0100 (Thu, 16 Dec 2010)
Log Message:
-----------
Bugfix, irc report
After using loop-cut with multiple edges, transform widget
disappeared. Reason was a variable being set in function
not being called on cancelled operators. Now it's in Posttrans()
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-12-16 16:09:23 UTC (rev 33713)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c
2010-12-16 17:19:24 UTC (rev 33714)
@@ -5122,17 +5122,7 @@
clear_trans_object_base_flags(t);
- if(t->spacetype == SPACE_VIEW3D)
- {
- View3D *v3d = t->view;
- /* restore manipulator */
- if (t->flag & T_MODAL) {
- v3d->twtype = t->twtype;
- }
- }
-
-
#if 0 // TRANSFORM_FIX_ME
if(resetslowpar)
reset_slowparents();
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c
2010-12-16 16:09:23 UTC (rev 33713)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c
2010-12-16 17:19:24 UTC (rev 33714)
@@ -1159,6 +1159,13 @@
if(sima->flag & SI_LIVE_UNWRAP)
ED_uvedit_live_unwrap_end(t->state == TRANS_CANCEL);
}
+ else if(t->spacetype==SPACE_VIEW3D) {
+ View3D *v3d = t->sa->spacedata.first;
+ /* restore manipulator */
+ if (t->flag & T_MODAL) {
+ v3d->twtype = t->twtype;
+ }
+ }
if (t->mouse.data)
{
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
