Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-15 19:37:05 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-15 22:31:18 +0300
commit031dcbf15be5eef3d76488949ccebbf0872b1086 (patch)
tree5a4c40cee0df7ddf08fdbf8c6fedabae4b86b1b7 /source/blender/nodes
parent50975026ff845c8c4cd411635cf4d22d0ea6ddaa (diff)
Fix crash in some Eevee shader node setups after vector math node changes
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_geometry.c10
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_tex_coord.c10
2 files changed, 16 insertions, 4 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_geometry.c b/source/blender/nodes/shader/nodes/node_shader_geometry.c
index d24d83dbc8a..6b23fec5f18 100644
--- a/source/blender/nodes/shader/nodes/node_shader_geometry.c
+++ b/source/blender/nodes/shader/nodes/node_shader_geometry.c
@@ -68,8 +68,14 @@ static int node_shader_gpu_geometry(GPUMaterial *mat,
* The resulting vector can still be a bit wrong but not as much.
* (see T70644) */
if (node->branch_tag != 0 && ELEM(i, 1, 2, 4)) {
- GPU_link(
- mat, "vector_math_normalize", out[i].link, out[i].link, out[i].link, &out[i].link, NULL);
+ GPU_link(mat,
+ "vector_math_normalize",
+ out[i].link,
+ out[i].link,
+ out[i].link,
+ out[i].link,
+ &out[i].link,
+ NULL);
}
}
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_coord.c b/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
index 8bb17acc4d3..3c1a2280aae 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
@@ -68,8 +68,14 @@ static int node_shader_gpu_tex_coord(GPUMaterial *mat,
* The resulting vector can still be a bit wrong but not as much.
* (see T70644) */
if (node->branch_tag != 0 && ELEM(i, 1, 6)) {
- GPU_link(
- mat, "vector_math_normalize", out[i].link, out[i].link, out[i].link, &out[i].link, NULL);
+ GPU_link(mat,
+ "vector_math_normalize",
+ out[i].link,
+ out[i].link,
+ out[i].link,
+ out[i].link,
+ &out[i].link,
+ NULL);
}
}