[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25447] trunk/blender/source/blender/ editors/transform: Bugfix: [#20403] transform manipulation widgets with normal coordinates

[Martin Poirier]

Revision: 25447
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25447
Author:   theeth
Date:     2009-12-17 18:50:55 +0100 (Thu, 17 Dec 2009)

Log Message:
-----------
Bugfix: [#20403] transform manipulation widgets with normal coordinates

Disable manipulator drawing during transform

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform.h
    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.h
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.h  2009-12-17 
17:42:26 UTC (rev 25446)
+++ trunk/blender/source/blender/editors/transform/transform.h  2009-12-17 
17:50:55 UTC (rev 25447)
@@ -302,9 +302,10 @@
        void      (*customFree)(struct TransInfo *); /* if a special free 
function is needed */
 
        /*************** NEW STUFF *********************/
-       short           launch_event; /* event type used to launch transform */
+       short           launch_event;   /* event type used to launch transform 
*/
 
        short           current_orientation;
+       short           twtype;                 /* backup from view3d, to 
restore on end */
 
        short           prop_mode;
        

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c      
2009-12-17 17:42:26 UTC (rev 25446)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c      
2009-12-17 17:50:55 UTC (rev 25447)
@@ -5006,6 +5006,17 @@
 
        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 
2009-12-17 17:42:26 UTC (rev 25446)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c 
2009-12-17 17:50:55 UTC (rev 25447)
@@ -927,6 +927,12 @@
                t->view = v3d;
                t->animtimer= CTX_wm_screen(C)->animtimer;
                
+               /* turn manipulator off during transform */
+               if (t->flag & T_MODAL) {
+                       t->twtype = v3d->twtype;
+                       v3d->twtype = 0;
+               }
+
                if(v3d->flag & V3D_ALIGN) t->flag |= T_V3D_ALIGN;
                t->around = v3d->around;
                


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs