diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2022-06-02 11:05:56 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2022-06-02 11:05:56 +0300 |
commit | 40ecf9d606358d773bfe977e6bc85580e5818cc6 (patch) | |
tree | d0ee9345cf500d5776e1868a2250cae587b7d205 | |
parent | d73adfdc863e0c003647a0c59d4d92b4f6583420 (diff) | |
parent | 33eeed5b3ca94c49c4c7aca26f63e913bfd59414 (diff) |
Merge branch 'blender-v3.2-release'
-rw-r--r-- | source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl index 4c9ff31622f..fed7ac7df66 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_geometry.glsl @@ -1,6 +1,6 @@ #pragma BLENDER_REQUIRE(gpu_shader_material_tangent.glsl) -void node_geometry(vec3 orco, +void node_geometry(vec3 orco_attr, out vec3 position, out vec3 normal, out vec3 tangent, @@ -21,8 +21,8 @@ void node_geometry(vec3 orco, tangent = g_data.curve_T; } else { - tangent_orco_z(orco, orco); - node_tangent(orco, tangent); + tangent_orco_z(orco_attr, orco_attr); + node_tangent(orco_attr, tangent); } parametric = vec3(g_data.barycentric_coords, 0.0); |