replace macros with bli math functions for nodes

7 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.c b/source/blender/nodes/texture/nodes/node_texture_bricks.c
index 2011426b845..0700085a787 100644
--- a/source/blender/nodes/texture/nodes/node_texture_bricks.c
+++ b/source/blender/nodes/texture/nodes/node_texture_bricks.c
@@ -107,9 +107,9 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	if( ins_x < mortar_thickness || ins_y < mortar_thickness ||
 		ins_x > (brick_width - mortar_thickness) ||
 		ins_y > (row_height - mortar_thickness) ) {
-		QUATCOPY( out, mortar );
+		copy_v4_v4( out, mortar );
 	} else {
-		QUATCOPY( out, bricks1 );
+		copy_v4_v4( out, bricks1 );
 		ramp_blend( MA_RAMP_BLEND, out, out+1, out+2, tint, bricks2 );
 	}
 }
diff --git a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
index 111d6e78023..3346592f7d3 100644
--- a/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
+++ b/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
@@ -66,7 +66,7 @@ static void do_hue_sat_fac(bNode *UNUSED(node), float *out, float hue, float sat
 		out[2]= mfac*in[2] + fac*col[2];
 	}
 	else {
-		QUATCOPY(out, in);
+		copy_v4_v4(out, in);
 	}
 }
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_image.c b/source/blender/nodes/texture/nodes/node_texture_image.c
index 3a81ecb1466..0ead3a3dec2 100644
--- a/source/blender/nodes/texture/nodes/node_texture_image.c
+++ b/source/blender/nodes/texture/nodes/node_texture_image.c
@@ -76,7 +76,7 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **UNUSED(i
 			while( py >= ibuf->y ) py -= ibuf->y;
 			
 			result = ibuf->rect_float + py*ibuf->x*4 + px*4;
-			QUATCOPY( out, result );
+			copy_v4_v4( out, result );
 		}
 	}
 }
diff --git a/source/blender/nodes/texture/nodes/node_texture_invert.c b/source/blender/nodes/texture/nodes/node_texture_invert.c
index 3ad11026f28..5ee60d02e32 100644
--- a/source/blender/nodes/texture/nodes/node_texture_invert.c
+++ b/source/blender/nodes/texture/nodes/node_texture_invert.c
@@ -54,7 +54,7 @@ static void colorfn(float *out, TexParams *p, bNode *UNUSED(node), bNodeStack **
 	col[1] = 1.0f - col[1];
 	col[2] = 1.0f - col[2];
 	
-	VECCOPY(out, col);
+	copy_v3_v3(out, col);
 	out[3] = col[3];
 }
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
index c68adf2f4aa..e3b5119c797 100644
--- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
+++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
@@ -55,7 +55,7 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	
 	CLAMP(fac, 0.0f, 1.0f);
 	
-	QUATCOPY(out, col1);
+	copy_v4_v4(out, col1);
 	ramp_blend(node->custom1, out, out+1, out+2, fac, col2);
 }
 
diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.c b/source/blender/nodes/texture/nodes/node_texture_proc.c
index d9ac8700be1..3012d313db5 100644
--- a/source/blender/nodes/texture/nodes/node_texture_proc.c
+++ b/source/blender/nodes/texture/nodes/node_texture_proc.c
@@ -75,10 +75,10 @@ static void do_proc(float *result, TexParams *p, float *col1, float *col2, char
 		return;
 	
 	if(textype & TEX_RGB) {
-		QUATCOPY(result, &texres.tr);
+		copy_v4_v4(result, &texres.tr);
 	}
 	else {
-		QUATCOPY(result, col1);
+		copy_v4_v4(result, col1);
 		ramp_blend(MA_RAMP_BLEND, result, result+1, result+2, texres.tin, col2);
 	}
 }
diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.c b/source/blender/nodes/texture/nodes/node_texture_texture.c
index 1b8eb3aabc6..667570582fe 100644
--- a/source/blender/nodes/texture/nodes/node_texture_texture.c
+++ b/source/blender/nodes/texture/nodes/node_texture_texture.c
@@ -65,7 +65,7 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	
 	if(node->custom2 || node->need_exec==0) {
 		/* this node refers to its own texture tree! */
-		QUATCOPY(out, (fabs(co[0] - co[1]) < .01) ? white : red );
+		copy_v4_v4(out, (fabs(co[0] - co[1]) < .01) ? white : red );
 	}
 	else if(nodetex) {
 		TexResult texres;
@@ -81,10 +81,10 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 			&texres, thread, 0, p->shi, p->mtex);
 		
 		if(textype & TEX_RGB) {
-			QUATCOPY(out, &texres.tr);
+			copy_v4_v4(out, &texres.tr);
 		}
 		else {
-			QUATCOPY(out, col1);
+			copy_v4_v4(out, col1);
 			ramp_blend(MA_RAMP_BLEND, out, out+1, out+2, texres.tin, col2);
 		}
 	}