merged 30707:31141 from trunk
authorMike Erwin <significant.bit@gmail.com>
Sat, 7 Aug 2010 12:51:51 +0000 (12:51 +0000)
committerMike Erwin <significant.bit@gmail.com>
Sat, 7 Aug 2010 12:51:51 +0000 (12:51 +0000)
1  2 
intern/ghost/intern/GHOST_SystemCocoa.mm
source/blender/blenlib/intern/math_rotation.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/windowmanager/intern/wm_event_system.c

index 981b45c7396f35f639608a75265b795ab7c37c0f,e71899e40f794456fcdb3f7bff794f01b7cf1b2c..8dd901d9e54a21e964aa02f3e90e476ab6abdd46
@@@ -310,10 -310,10 +310,10 @@@ static void viewops_data_create(bContex
        vod->ar= CTX_wm_region(C);
        vod->rv3d= rv3d= vod->ar->regiondata;
        vod->dist0= rv3d->dist;
-       QUATCOPY(vod->oldquat, rv3d->viewquat);
+       copy_qt_qt(vod->oldquat, rv3d->viewquat);
        vod->origx= vod->oldx= event->x;
        vod->origy= vod->oldy= event->y;
 -      vod->origkey= event->type; /* the key that triggered the operator.  */
 +      vod->origkey= event->type; /* the key that triggered the operator. */
        vod->use_dyn_ofs= (U.uiflag & USER_ORBIT_SELECTION) ? 1:0;
  
        if (vod->use_dyn_ofs) {