svn merge -r41575:41602 ^/trunk/blender

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index d532d7d350b..69753032f42 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -606,11 +606,11 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 
 					BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL) {
 						if(BM_TestHFlag(efa, BM_SELECT)) {
-							VECADD(normal, normal, efa->no);
+							add_v3_v3(normal, efa->no);
 							sub_v3_v3v3(vec,
 							            ((BMLoopList*)efa->loops.first)->first->v->co,
 							            (((BMLoopList*)efa->loops.first)->first->next)->v->co);
-							VECADD(plane, plane, vec);
+							add_v3_v3(plane, vec);
 						}
 					}
 					
@@ -666,7 +666,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 						if(BM_TestHFlag(eed, BM_SELECT)) {
 							/* use average vert normals as plane and edge vector as normal */
 							copy_v3_v3(plane, eed->v1->no);
-							VECADD(plane, plane, eed->v2->no);
+							add_v3_v3(plane, eed->v2->no);
 							sub_v3_v3v3(normal, eed->v2->co, eed->v1->co);
 							break;
 						}
@@ -687,7 +687,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3],
 								v2 = eve;
 								
 								copy_v3_v3(plane, v1->no);
-								VECADD(plane, plane, v2->no);
+								add_v3_v3(plane, v2->no);
 								sub_v3_v3v3(normal, v2->co, v1->co);
 								break; 
 							}