diff options
| author | Bastien Montagne <b.mont29@gmail.com> | 2020-02-28 12:45:29 +0300 |
|---|---|---|
| committer | Bastien Montagne <b.mont29@gmail.com> | 2020-02-28 12:45:29 +0300 |
| commit | eb043d44f26bc8c245f2a3ad42d65ab5626003e4 (patch) | |
| tree | 40c355a26858d81296da08a06c2a8ec502f55297 /source/blender/nodes/shader/nodes/node_shader_tangent.c | |
| parent | 88e1152d4acc2852bb45f0726e27f507a502fbeb (diff) | |
| parent | 9cac5fa681c55edcf6e856e59e07e90e2ae25965 (diff) | |
Merge branch 'master' into id-ensure-unique-memory-addressid-ensure-unique-memory-address
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_tangent.c')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tangent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.c b/source/blender/nodes/shader/nodes/node_shader_tangent.c index 478b9524737..474db465d87 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.c +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.c @@ -43,10 +43,10 @@ static int node_shader_gpu_tangent(GPUMaterial *mat, if (attr->direction_type == SHD_TANGENT_UVMAP) { return GPU_stack_link( - mat, node, "node_tangentmap", in, out, GPU_attribute(CD_TANGENT, attr->uv_map)); + mat, node, "node_tangentmap", in, out, GPU_attribute(mat, CD_TANGENT, attr->uv_map)); } else { - GPUNodeLink *orco = GPU_attribute(CD_ORCO, ""); + GPUNodeLink *orco = GPU_attribute(mat, CD_ORCO, ""); if (attr->axis == SHD_TANGENT_AXIS_X) { GPU_link(mat, "tangent_orco_x", orco, &orco); |