Fix cycles issue with mapping node rotation and scale order. When using both

scale and rotation in mapping node, there would be shearing, and the only way
to avoid that was to add 2 mapping nodes. This is because to transform the
texture, the inverse transform needs to be done on the texture coordinate

Now the mapping node has Texture/Point/Vector/Normal types to transform the
vector for a particular purpose. Point is the existing behavior, Texture is
the new default that behaves more like you might expect.

21 files changed, 117 insertions, 38 deletions

diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h
index ac0d507003e..2a00dee2a3f 100644
--- a/source/blender/blenkernel/BKE_texture.h
+++ b/source/blender/blenkernel/BKE_texture.h
@@ -101,8 +101,8 @@ void set_current_particle_texture(struct ParticleSettings *part, struct Tex *tex
 
 int has_current_material_texture(struct Material *ma);
 
-struct TexMapping *add_tex_mapping(void);
-void default_tex_mapping(struct TexMapping *texmap);
+struct TexMapping *add_tex_mapping(int type);
+void default_tex_mapping(struct TexMapping *texmap, int type);
 void init_tex_mapping(struct TexMapping *texmap);
 
 struct ColorMapping *add_color_mapping(void);
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index e2b7358525a..d98a6cbe0cc 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -71,16 +71,16 @@
 
 /* ****************** Mapping ******************* */
 
-TexMapping *add_tex_mapping(void)
+TexMapping *add_tex_mapping(int type)
 {
 	TexMapping *texmap = MEM_callocN(sizeof(TexMapping), "TexMapping");
 	
-	default_tex_mapping(texmap);
+	default_tex_mapping(texmap, type);
 	
 	return texmap;
 }
 
-void default_tex_mapping(TexMapping *texmap)
+void default_tex_mapping(TexMapping *texmap, int type)
 {
 	memset(texmap, 0, sizeof(TexMapping));
 
@@ -92,11 +92,12 @@ void default_tex_mapping(TexMapping *texmap)
 	texmap->projy = PROJ_Y;
 	texmap->projz = PROJ_Z;
 	texmap->mapping = MTEX_FLAT;
+	texmap->type = type;
 }
 
 void init_tex_mapping(TexMapping *texmap)
 {
-	float smat[3][3], rmat[3][3], mat[3][3], proj[3][3];
+	float smat[4][4], rmat[4][4], tmat[4][4], proj[4][4], size[3];
 
 	if (texmap->projx == PROJ_X && texmap->projy == PROJ_Y && texmap->projz == PROJ_Z &&
 	    is_zero_v3(texmap->loc) && is_zero_v3(texmap->rot) && is_one_v3(texmap->size))
@@ -107,7 +108,8 @@ void init_tex_mapping(TexMapping *texmap)
 	}
 	else {
 		/* axis projection */
-		zero_m3(proj);
+		zero_m4(proj);
+		proj[3][3] = 1.0f;
 
 		if (texmap->projx != PROJ_N)
 			proj[texmap->projx - 1][0] = 1.0f;
@@ -117,19 +119,50 @@ void init_tex_mapping(TexMapping *texmap)
 			proj[texmap->projz - 1][2] = 1.0f;
 
 		/* scale */
-		size_to_mat3(smat, texmap->size);
+		copy_v3_v3(size, texmap->size);
+
+		if (ELEM(texmap->type, TEXMAP_TYPE_TEXTURE, TEXMAP_TYPE_NORMAL)) {
+			/* keep matrix invertible */
+			if(fabsf(size[0]) < 1e-5f)
+				size[0] = signf(size[0])*1e-5f;
+			if(fabsf(size[1]) < 1e-5f)
+				size[1] = signf(size[1])*1e-5f;
+			if(fabsf(size[2]) < 1e-5f)
+				size[2] = signf(size[2])*1e-5f;
+		}
 		
+		size_to_mat4(smat, texmap->size);
+
 		/* rotation */
-		/* TexMapping rotation are now in radians. */
-		eul_to_mat3(rmat, texmap->rot);
-		
-		/* compose it all */
-		mul_m3_m3m3(mat, rmat, smat);
-		mul_m3_m3m3(mat, proj, mat);
-		
+		eul_to_mat4(rmat, texmap->rot);
+
 		/* translation */
-		copy_m4_m3(texmap->mat, mat);
-		copy_v3_v3(texmap->mat[3], texmap->loc);
+		unit_m4(tmat);
+		copy_v3_v3(tmat[3], texmap->loc);
+
+		if (texmap->type == TEXMAP_TYPE_TEXTURE) {
+			/* to transform a texture, the inverse transform needs
+			 * to be applied to the texture coordinate */
+			mul_serie_m4(texmap->mat, tmat, rmat, smat, 0, 0, 0, 0, 0);
+			invert_m4(texmap->mat);
+		}
+		else if (texmap->type == TEXMAP_TYPE_POINT) {
+			/* forward transform */
+			mul_serie_m4(texmap->mat, tmat, rmat, smat, 0, 0, 0, 0, 0);
+		}
+		else if (texmap->type == TEXMAP_TYPE_VECTOR) {
+			/* no translation for vectors */
+			mul_m4_m4m4(texmap->mat, rmat, smat);
+		}
+		else if (texmap->type == TEXMAP_TYPE_NORMAL) {
+			/* no translation for normals, and inverse transpose */
+			mul_m4_m4m4(texmap->mat, rmat, smat);
+			invert_m4(texmap->mat);
+			transpose_m4(texmap->mat);
+		}
+
+		/* projection last */
+		mul_m4_m4m4(texmap->mat, texmap->mat, proj);
 
 		texmap->flag &= ~TEXMAP_UNIT_MATRIX;
 	}
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 45428425138..308e9afa42f 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -709,6 +709,8 @@ static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), Poin
 {
 	uiLayout *row;
 	
+	uiItemR(layout, ptr, "type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+
 	uiItemL(layout, IFACE_("Location:"), ICON_NONE);
 	row = uiLayoutRow(layout, TRUE);
 	uiItemR(row, ptr, "translation", 0, "", ICON_NONE);
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index a82d1a71a1e..5cfe3fd2082 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -975,7 +975,7 @@ typedef struct NodeShaderNormalMap {
 #define SHD_NORMAL_MAP_BLENDER_OBJECT	3
 #define SHD_NORMAL_MAP_BLENDER_WORLD	4
 
-/* tangent */
+/* subsurface */
 #define SHD_SUBSURFACE_COMPATIBLE		0
 #define SHD_SUBSURFACE_CUBIC			1
 #define SHD_SUBSURFACE_GAUSSIAN			2
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 0b6e5f9c7bb..fcd0575f1c5 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -263,7 +263,7 @@ typedef struct TexMapping {
 	float loc[3], rot[3], size[3];
 	int flag;
 	char projx, projy, projz, mapping;
-	int pad;
+	int type;
 	
 	float mat[4][4];
 	float min[3], max[3];
@@ -287,6 +287,12 @@ typedef struct ColorMapping {
 #define TEXMAP_CLIP_MAX		2
 #define TEXMAP_UNIT_MATRIX	4
 
+/* texmap->type */
+#define TEXMAP_TYPE_POINT		0
+#define TEXMAP_TYPE_TEXTURE		1
+#define TEXMAP_TYPE_VECTOR		2
+#define TEXMAP_TYPE_NORMAL		3
+
 /* colormap->flag */
 #define COLORMAP_USE_RAMP 1
 
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index eb5f5933bf1..cc99296614d 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3135,10 +3135,24 @@ static void def_sh_material(StructRNA *srna)
 
 static void def_sh_mapping(StructRNA *srna)
 {
+	static EnumPropertyItem prop_vect_type_items[] = {
+		{TEXMAP_TYPE_TEXTURE, "TEXTURE",  0, "Texture", "Transforms a texture by inverse mapping the texture coordinate"},
+		{TEXMAP_TYPE_POINT,   "POINT",    0, "Point",   "Transforms a point"},
+		{TEXMAP_TYPE_VECTOR,  "VECTOR",   0, "Vector",  "Transforms a direction vector"},
+		{TEXMAP_TYPE_NORMAL,  "NORMAL",   0, "Normal",  "Transforms a normal vector with unit length"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	PropertyRNA *prop;
 	
 	RNA_def_struct_sdna_from(srna, "TexMapping", "storage");
 
+	prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "type");
+	RNA_def_property_enum_items(prop, prop_vect_type_items);
+	RNA_def_property_ui_text(prop, "Type", "Type of vector that the mapping transforms");
+	RNA_def_property_update(prop, 0, "rna_Mapping_Node_update");
+
 	prop = RNA_def_property(srna, "translation", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "loc");
 	RNA_def_property_ui_text(prop, "Location", "");
@@ -3522,9 +3536,9 @@ static void def_sh_tex_coord(StructRNA *srna)
 static void def_sh_vect_transform(StructRNA *srna)
 {
 	static EnumPropertyItem prop_vect_type_items[] = {
-		{SHD_VECT_TRANSFORM_TYPE_VECTOR, "VECTOR",  0, "Vector",   ""},
-		{SHD_VECT_TRANSFORM_TYPE_POINT,  "POINT",   0, "Point",    ""},
-		{SHD_VECT_TRANSFORM_TYPE_NORMAL, "NORMAL",  0, "Normal",   ""},
+		{SHD_VECT_TRANSFORM_TYPE_POINT,  "POINT",   0, "Point",    "Transforms a point"},
+		{SHD_VECT_TRANSFORM_TYPE_VECTOR, "VECTOR",  0, "Vector",   "Transforms a direction vector"},
+		{SHD_VECT_TRANSFORM_TYPE_NORMAL, "NORMAL",  0, "Normal",   "Transforms a normal vector with unit length"},
 		{0, NULL, 0, NULL, NULL}
 	};
 
diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index a27e41a96c8..6aee4486cf5 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -495,6 +495,14 @@ static void rna_def_texmapping(BlenderRNA *brna)
 		{0, NULL, 0, NULL, NULL}
 	};
 		
+	static EnumPropertyItem prop_vect_type_items[] = {
+		{TEXMAP_TYPE_TEXTURE, "TEXTURE",  0, "Texture", "Transforms a texture by inverse mapping the texture coordinate"},
+		{TEXMAP_TYPE_POINT,   "POINT",    0, "Point",   "Transforms a point"},
+		{TEXMAP_TYPE_VECTOR,  "VECTOR",   0, "Vector",  "Transforms a direction vector"},
+		{TEXMAP_TYPE_NORMAL,  "NORMAL",   0, "Normal",  "Transforms a normal vector with unit length"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	static EnumPropertyItem prop_xyz_mapping_items[] = {
 		{0, "NONE", 0, "None", ""},
 		{1, "X", 0, "X", ""},
@@ -509,6 +517,12 @@ static void rna_def_texmapping(BlenderRNA *brna)
 	srna = RNA_def_struct(brna, "TexMapping", NULL);
 	RNA_def_struct_ui_text(srna, "Texture Mapping", "Texture coordinate mapping settings");
 
+	prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "type");
+	RNA_def_property_enum_items(prop, prop_vect_type_items);
+	RNA_def_property_ui_text(prop, "Type", "Type of vector that the mapping transforms");
+	RNA_def_property_update(prop, 0, "rna_Texture_mapping_update");
+
 	prop = RNA_def_property(srna, "translation", PROP_FLOAT, PROP_TRANSLATION);
 	RNA_def_property_float_sdna(prop, NULL, "loc");
 	RNA_def_property_ui_text(prop, "Location", "");
diff --git a/source/blender/nodes/composite/nodes/node_composite_mapValue.c b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
index 316e5b344ce..22d16e93879 100644
--- a/source/blender/nodes/composite/nodes/node_composite_mapValue.c
+++ b/source/blender/nodes/composite/nodes/node_composite_mapValue.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate cmp_node_map_value_out[] = {
 
 static void node_composit_init_map_value(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = add_tex_mapping();
+	node->storage = add_tex_mapping(TEXMAP_TYPE_POINT);
 }
 
 void register_node_type_cmp_map_value(void)
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c
index aed8a0224f1..86e59cd779a 100644
--- a/source/blender/nodes/shader/node_shader_util.c
+++ b/source/blender/nodes/shader/node_shader_util.c
@@ -271,6 +271,9 @@ void node_shader_gpu_tex_mapping(GPUMaterial *mat, bNode *node, GPUNodeStack *in
 		GPUNodeLink *tdomax = GPU_uniform(&domax);
 
 		GPU_link(mat, "mapping", in[0].link, tmat, tmin, tmax, tdomin, tdomax, &in[0].link);
+
+		if (texmap->type == TEXMAP_TYPE_NORMAL)
+			GPU_link(mat, "texco_norm", in[0].link, &in[0].link);
 	}
 }
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.c b/source/blender/nodes/shader/nodes/node_shader_mapping.c
index 05936e22775..82444caadb8 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mapping.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mapping.c
@@ -29,7 +29,6 @@
  *  \ingroup shdnodes
  */
 
-
 #include "node_shader_util.h"
 
 /* **************** MAPPING  ******************** */
@@ -53,7 +52,7 @@ static void node_shader_exec_mapping(void *UNUSED(data), int UNUSED(thread), bNo
 	/* stack order output: vector */
 	nodestack_get_vec(vec, SOCK_VECTOR, in[0]);
 	mul_m4_v3(texmap->mat, vec);
-	
+
 	if (texmap->flag & TEXMAP_CLIP_MIN) {
 		if (vec[0] < texmap->min[0]) vec[0] = texmap->min[0];
 		if (vec[1] < texmap->min[1]) vec[1] = texmap->min[1];
@@ -64,12 +63,15 @@ static void node_shader_exec_mapping(void *UNUSED(data), int UNUSED(thread), bNo
 		if (vec[1] > texmap->max[1]) vec[1] = texmap->max[1];
 		if (vec[2] > texmap->max[2]) vec[2] = texmap->max[2];
 	}
+
+	if (texmap->type == TEXMAP_TYPE_NORMAL)
+		normalize_v3(vec);
 }
 
 
 static void node_shader_init_mapping(bNodeTree *UNUSED(ntree), bNode *node)
 {
-	node->storage = add_tex_mapping();
+	node->storage = add_tex_mapping(TEXMAP_TYPE_TEXTURE);
 }
 
 static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
@@ -83,7 +85,12 @@ static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, bNodeExecData *UNUS
 	GPUNodeLink *tdomin = GPU_uniform(&domin);
 	GPUNodeLink *tdomax = GPU_uniform(&domax);
 
-	return GPU_stack_link(mat, "mapping", in, out, tmat, tmin, tmax, tdomin, tdomax);
+	int result = GPU_stack_link(mat, "mapping", in, out, tmat, tmin, tmax, tdomin, tdomax);
+
+	if (result && texmap->type == TEXMAP_TYPE_NORMAL)
+		GPU_link(mat, "texco_norm", out[0].link, &out[0].link);
+
+	return result;
 }
 
 void register_node_type_sh_mapping(void)
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_brick.c b/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
index 826b7d9337d..480d285af6c 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
@@ -51,7 +51,7 @@ static bNodeSocketTemplate sh_node_tex_brick_out[] = {
 static void node_shader_init_tex_brick(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexBrick *tex = MEM_callocN(sizeof(NodeTexBrick), "NodeTexBrick");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	
 	tex->offset = 0.5f;
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_checker.c b/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
index ceb3911f429..82125f3ea02 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
@@ -46,7 +46,7 @@ static bNodeSocketTemplate sh_node_tex_checker_out[] = {
 static void node_shader_init_tex_checker(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexChecker *tex = MEM_callocN(sizeof(NodeTexChecker), "NodeTexChecker");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 
 	node->storage = tex;
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
index 2fbf5b6faf9..923684304bf 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate sh_node_tex_environment_out[] = {
 static void node_shader_init_tex_environment(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexEnvironment *tex = MEM_callocN(sizeof(NodeTexEnvironment), "NodeTexEnvironment");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->color_space = SHD_COLORSPACE_COLOR;
 	tex->projection = SHD_PROJ_EQUIRECTANGULAR;
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
index 5ee3b1f6176..00dd45df7b0 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
@@ -43,7 +43,7 @@ static bNodeSocketTemplate sh_node_tex_gradient_out[] = {
 static void node_shader_init_tex_gradient(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexGradient *tex = MEM_callocN(sizeof(NodeTexGradient), "NodeTexGradient");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->gradient_type = SHD_BLEND_LINEAR;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
index 53c44ebd715..935c0c618c7 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate sh_node_tex_image_out[] = {
 static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexImage *tex = MEM_callocN(sizeof(NodeTexImage), "NodeTexImage");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->color_space = SHD_COLORSPACE_COLOR;
 	tex->iuser.frames = 1;
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
index 38292939a3c..c043484d550 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate sh_node_tex_magic_out[] = {
 static void node_shader_init_tex_magic(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexMagic *tex = MEM_callocN(sizeof(NodeTexMagic), "NodeTexMagic");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->depth = 2;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
index b41cc7d8812..33ae2dbc8c2 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
@@ -49,7 +49,7 @@ static bNodeSocketTemplate sh_node_tex_musgrave_out[] = {
 static void node_shader_init_tex_musgrave(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexMusgrave *tex = MEM_callocN(sizeof(NodeTexMusgrave), "NodeTexMusgrave");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->musgrave_type = SHD_MUSGRAVE_FBM;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.c b/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
index a7009b81e9a..9e63e0278e6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
@@ -46,7 +46,7 @@ static bNodeSocketTemplate sh_node_tex_noise_out[] = {
 static void node_shader_init_tex_noise(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexNoise *tex = MEM_callocN(sizeof(NodeTexNoise), "NodeTexNoise");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 
 	node->storage = tex;
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
index c80b5282de3..0c842207c05 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
@@ -42,7 +42,7 @@ static bNodeSocketTemplate sh_node_tex_sky_out[] = {
 static void node_shader_init_tex_sky(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexSky *tex = MEM_callocN(sizeof(NodeTexSky), "NodeTexSky");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->sun_direction[0] = 0.0f;
 	tex->sun_direction[1] = 0.0f;
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
index 3f1b0638b99..5ace85506a6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
@@ -44,7 +44,7 @@ static bNodeSocketTemplate sh_node_tex_voronoi_out[] = {
 static void node_shader_init_tex_voronoi(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexVoronoi *tex = MEM_callocN(sizeof(NodeTexVoronoi), "NodeTexVoronoi");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->coloring = SHD_VORONOI_INTENSITY;
 
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
index a424265c94a..a189d927673 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
@@ -47,7 +47,7 @@ static bNodeSocketTemplate sh_node_tex_wave_out[] = {
 static void node_shader_init_tex_wave(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	NodeTexWave *tex = MEM_callocN(sizeof(NodeTexWave), "NodeTexWave");
-	default_tex_mapping(&tex->base.tex_mapping);
+	default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
 	default_color_mapping(&tex->base.color_mapping);
 	tex->wave_type = SHD_WAVE_BANDS;