Merging r41564 through r41596 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / interface / interface_widgets.c
index d0c446a..7a138e7 100644 (file)
@@ -1874,38 +1874,38 @@ void ui_draw_gradient(rcti *rect, float *hsv, int type, float alpha)
                        break;
                case UI_GRAD_H:
                        hsv_to_rgb(0.0, 1.0, 1.0,   &col1[0][0], &col1[0][1], &col1[0][2]);
-                       VECCOPY(col1[1], col1[0]);
-                       VECCOPY(col1[2], col1[0]);
-                       VECCOPY(col1[3], col1[0]);
+                       copy_v3_v3(col1[1], col1[0]);
+                       copy_v3_v3(col1[2], col1[0]);
+                       copy_v3_v3(col1[3], col1[0]);
                        break;
                case UI_GRAD_S:
                        hsv_to_rgb(1.0, 0.0, 1.0,   &col1[1][0], &col1[1][1], &col1[1][2]);
-                       VECCOPY(col1[0], col1[1]);
-                       VECCOPY(col1[2], col1[1]);
-                       VECCOPY(col1[3], col1[1]);
+                       copy_v3_v3(col1[0], col1[1]);
+                       copy_v3_v3(col1[2], col1[1]);
+                       copy_v3_v3(col1[3], col1[1]);
                        break;
                case UI_GRAD_V:
                        hsv_to_rgb(1.0, 1.0, 0.0,   &col1[2][0], &col1[2][1], &col1[2][2]);
-                       VECCOPY(col1[0], col1[2]);
-                       VECCOPY(col1[1], col1[2]);
-                       VECCOPY(col1[3], col1[2]);
+                       copy_v3_v3(col1[0], col1[2]);
+                       copy_v3_v3(col1[1], col1[2]);
+                       copy_v3_v3(col1[3], col1[2]);
                        break;
                default:
                        assert(!"invalid 'type' argument");
                        hsv_to_rgb(1.0, 1.0, 1.0,   &col1[2][0], &col1[2][1], &col1[2][2]);
-                       VECCOPY(col1[0], col1[2]);
-                       VECCOPY(col1[1], col1[2]);
-                       VECCOPY(col1[3], col1[2]);                      
+                       copy_v3_v3(col1[0], col1[2]);
+                       copy_v3_v3(col1[1], col1[2]);
+                       copy_v3_v3(col1[3], col1[2]);
        }
        
        /* old below */
        
        for(dx=0.0f; dx<1.0f; dx+= 0.05f) {
                // previous color
-               VECCOPY(col0[0], col1[0]);
-               VECCOPY(col0[1], col1[1]);
-               VECCOPY(col0[2], col1[2]);
-               VECCOPY(col0[3], col1[3]);
+               copy_v3_v3(col0[0], col1[0]);
+               copy_v3_v3(col0[1], col1[1]);
+               copy_v3_v3(col0[2], col1[2]);
+               copy_v3_v3(col0[3], col1[3]);
                
                // new color
                switch(type) {
@@ -1929,21 +1929,21 @@ void ui_draw_gradient(rcti *rect, float *hsv, int type, float alpha)
                                break;
                        case UI_GRAD_H:
                                hsv_to_rgb(dx, 1.0, 1.0,   &col1[0][0], &col1[0][1], &col1[0][2]);
-                               VECCOPY(col1[1], col1[0]);
-                               VECCOPY(col1[2], col1[0]);
-                               VECCOPY(col1[3], col1[0]);
+                               copy_v3_v3(col1[1], col1[0]);
+                               copy_v3_v3(col1[2], col1[0]);
+                               copy_v3_v3(col1[3], col1[0]);
                                break;
                        case UI_GRAD_S:
                                hsv_to_rgb(h, dx, 1.0,   &col1[1][0], &col1[1][1], &col1[1][2]);
-                               VECCOPY(col1[0], col1[1]);
-                               VECCOPY(col1[2], col1[1]);
-                               VECCOPY(col1[3], col1[1]);
+                               copy_v3_v3(col1[0], col1[1]);
+                               copy_v3_v3(col1[2], col1[1]);
+                               copy_v3_v3(col1[3], col1[1]);
                                break;
                        case UI_GRAD_V:
                                hsv_to_rgb(h, 1.0, dx,   &col1[2][0], &col1[2][1], &col1[2][2]);
-                               VECCOPY(col1[0], col1[2]);
-                               VECCOPY(col1[1], col1[2]);
-                               VECCOPY(col1[3], col1[2]);
+                               copy_v3_v3(col1[0], col1[2]);
+                               copy_v3_v3(col1[1], col1[2]);
+                               copy_v3_v3(col1[3], col1[2]);
                                break;
                }