Merging r41597 through r41607 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform_generics.c
index cfdd370e568e443c08bfaef1942833c13935a532..53e379a2d270a345d34718dded9d67b86a27f4bf 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -988,7 +986,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
        
        if (event)
        {
-               VECCOPY2D(t->imval, event->mval);
+               copy_v2_v2_int(t->imval, event->mval);
                t->event_type = event->type;
        }
        else
@@ -1346,7 +1344,7 @@ static void restoreElement(TransData *td)
                        copy_v3_v3(td->ext->size, td->ext->isize);
                }
                if (td->ext->quat) {
-                       QUATCOPY(td->ext->quat, td->ext->iquat);
+                       copy_qt_qt(td->ext->quat, td->ext->iquat);
                }
        }