[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38381] branches/merwin-spacenav/source/ blender/editors/space_view3d/view3d_edit.c: disable old ndof fly ( new stuff en route from another machine)

[Mike Erwin]

Revision: 38381
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38381
Author:   merwin
Date:     2011-07-14 03:28:31 +0000 (Thu, 14 Jul 2011)
Log Message:
-----------
disable old ndof fly (new stuff en route from another machine)

Modified Paths:
--------------
    branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c

Modified: 
branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c  
2011-07-14 03:27:33 UTC (rev 38380)
+++ branches/merwin-spacenav/source/blender/editors/space_view3d/view3d_edit.c  
2011-07-14 03:28:31 UTC (rev 38381)
@@ -1127,7 +1127,6 @@
 
        return OPERATOR_FINISHED;
 }
-#endif
 
 // BEGIN old fly code
 // derived from blender 2.4
@@ -1263,6 +1262,7 @@
 }
 
 // END old fly code
+#endif
 
 void VIEW3D_OT_ndof(struct wmOperatorType *ot)
 {
@@ -1272,8 +1272,8 @@
        ot->idname = "VIEW3D_OT_ndof";
 
        /* api callbacks */
-       ot->invoke = ndof_oldfly_invoke;
-//     ot->invoke = ndof_orbit_invoke;
+//     ot->invoke = ndof_oldfly_invoke;
+       ot->invoke = ndof_orbit_invoke;
        ot->poll = ED_operator_view3d_active;
 
        /* flags */

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