Merging r41564 through r41596 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / interface / interface_handlers.c
index 48c8d1761a65cfdd3e72a508e347d5c187430b30..c871c87983c7f0bc0c34096c420b25ba9358b25f 100644 (file)
@@ -952,7 +952,7 @@ static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleBut
                data->origstr= NULL;
                data->value= data->origvalue;
                data->origvalue= 0.0;
-               VECCOPY(data->vec, data->origvec);
+               copy_v3_v3(data->vec, data->origvec);
                data->origvec[0]= data->origvec[1]= data->origvec[2]= 0.0f;
        }
        else {
@@ -2132,7 +2132,7 @@ static void ui_blockopen_begin(bContext *C, uiBut *but, uiHandleButtonData *data
                        break;
                case COL:
                        ui_get_but_vectorf(but, data->origvec);
-                       VECCOPY(data->vec, data->origvec);
+                       copy_v3_v3(data->vec, data->origvec);
                        but->editvec= data->vec;
 
                        handlefunc= ui_block_func_COL;
@@ -5823,7 +5823,7 @@ static void ui_handle_button_return_submenu(bContext *C, wmEvent *event, uiBut *
        /* copy over return values from the closing menu */
        if(menu->menuretval == UI_RETURN_OK || menu->menuretval == UI_RETURN_UPDATE) {
                if(but->type == COL)
-                       VECCOPY(data->vec, menu->retvec)
+                       copy_v3_v3(data->vec, menu->retvec);
                else if(ELEM3(but->type, MENU, ICONROW, ICONTEXTROW))
                        data->value= menu->retvalue;
        }