diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 601bee4f670..c5a420b85a8 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -3508,8 +3508,7 @@ static void get_texture_value(Tex *texture, float *tex_co, TexResult *texres)
 {
 	int result_type;
 
-	result_type = multitex_ext(texture, tex_co, NULL,
-				   NULL, 1, texres);
+	result_type = multitex_ext(texture, tex_co, NULL, NULL, 0, texres);
 
 	/* if the texture gave an RGB value, we assume it didn't give a valid
 	* intensity, so calculate one (formula from do_material_tex).
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
index 31b669991ad..9a855938eef 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
@@ -72,8 +72,10 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	tex_input_vec(ax, in[2], p, thread);
 
 	rotate(new_co, a, ax, p->co);
-	rotate(new_dxt, a, ax, p->dxt);
-	rotate(new_dyt, a, ax, p->dyt);
+	if (p->osatex) {
+		rotate(new_dxt, a, ax, p->dxt);
+		rotate(new_dyt, a, ax, p->dyt);
+	}
 	
 	{
 		TexParams np = *p;
diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_scale.c b/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
index 609b117e5be..721c322c540 100644
--- a/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
+++ b/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
@@ -52,8 +52,10 @@ static void colorfn(float *out, TexParams *p, bNode *node, bNodeStack **in, shor
 	tex_input_vec(scale, in[1], p, thread);
 
 	mul_v3_v3v3(new_co, p->co, scale);
-	mul_v3_v3v3(new_dxt, p->dxt, scale);
-	mul_v3_v3v3(new_dyt, p->dyt, scale);
+	if (p->osatex) {
+		mul_v3_v3v3(new_dxt, p->dxt, scale);
+		mul_v3_v3v3(new_dyt, p->dyt, scale);
+	}
 	
 	tex_input_rgba(out, in[0], &np, thread);
 }