[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26639] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: commit from joe 26206, removed timer from zoom.

[Campbell Barton]

Revision: 26639
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26639
Author:   campbellbarton
Date:     2010-02-06 13:44:37 +0100 (Sat, 06 Feb 2010)

Log Message:
-----------
commit from joe 26206, removed timer from zoom. this is needed for continuous 
zoom.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2010-02-06 11:50:39 UTC (rev 26638)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c     
2010-02-06 12:44:37 UTC (rev 26639)
@@ -1076,9 +1076,13 @@
        short event_code= VIEW_PASS;
 
        /* execute the events */
-       if(event->type==MOUSEMOVE) {
+       if (event->type == TIMER && event->customdata == vod->timer) {
+               /* continuous zoom */
                event_code= VIEW_APPLY;
        }
+       else if(event->type==MOUSEMOVE) {
+               event_code= VIEW_APPLY;
+       }
        else if(event->type==EVT_MODAL_MAP) {
                switch (event->val) {
                        case VIEW_MODAL_CONFIRM:
@@ -1194,6 +1198,12 @@
                        return OPERATOR_FINISHED;
                }
                else {
+                       if(U.viewzoom == USER_ZOOM_CONT) {
+                               /* needs a timer to continue redrawing */
+                               vod->timer= 
WM_event_add_timer(CTX_wm_manager(C), CTX_wm_window(C), TIMER, 0.01f);
+                               vod->timer_lastdraw= PIL_check_seconds_timer();
+                       }
+
                        /* add temp handler */
                        WM_event_add_modal_handler(C, op);
 


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