[Bf-blender-cvs] [91b334b2f2f] master: Fix T74547 EEVEE: Image texture crash with use after free
Clément Foucault
noreply at git.blender.org
Mon Mar 30 19:57:28 CEST 2020
Commit: 91b334b2f2fcd50366da38a71b16aa0512f3779a
Author: Clément Foucault
Date: Mon Mar 30 19:57:16 2020 +0200
Branches: master
https://developer.blender.org/rB91b334b2f2fcd50366da38a71b16aa0512f3779a
Fix T74547 EEVEE: Image texture crash with use after free
Same fix than for the other mapping types.
===================================================================
M source/blender/nodes/shader/nodes/node_shader_tex_image.c
===================================================================
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 b4b1c1d3698..bfef9341913 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c
@@ -154,6 +154,12 @@ static int node_shader_gpu_tex_image(GPUMaterial *mat,
/* equivalent to normal_world_to_object */
GPU_link(mat, "normal_transform_transposed_m4v3", vnor, ob_mat, &norm);
+ {
+ /* See SHD_PROJ_FLAT for explanation. */
+ GPU_link(mat, "set_rgb", *texco, texco);
+ GPU_link(mat, "set_rgb", *texco, &input_coords);
+ in[0].link = input_coords;
+ }
GPU_link(
mat, gpu_node_name, *texco, norm, GPU_image(mat, ima, iuser), &col1, &col2, &col3);
GPU_stack_link(
More information about the Bf-blender-cvs
mailing list