summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-05-20 15:03:32 +0200
committerGitHub <noreply@github.com>2022-05-20 15:03:32 +0200
commitca4d2525bdea432548bffdae973efe4ac62dbfe5 (patch)
tree9e1b1b23504adcb645f8f8eb80eceebf96825ece
parentc95c9ab1c642cfa5abd760c7f7e3520cdff71ca7 (diff)
parenta3e016e07eba188057b52c3ee579fea8e63e5b9f (diff)
Merge pull request #61217 from WindyDarian/fix_blend_shapes
-rw-r--r--servers/rendering/renderer_rd/shaders/skeleton.glsl6
1 files changed, 3 insertions, 3 deletions
diff --git a/servers/rendering/renderer_rd/shaders/skeleton.glsl b/servers/rendering/renderer_rd/shaders/skeleton.glsl
index 4ef6a26443..a893a66c94 100644
--- a/servers/rendering/renderer_rd/shaders/skeleton.glsl
+++ b/servers/rendering/renderer_rd/shaders/skeleton.glsl
@@ -160,7 +160,7 @@ void main() {
}
if (params.has_tangent) {
- blend_tangent += decode_abgr_2_10_10_10(src_blend_shapes.data[base_offset]).rgb;
+ blend_tangent += decode_abgr_2_10_10_10(src_blend_shapes.data[base_offset]).rgb * w;
}
blend_total += w;
@@ -174,8 +174,8 @@ void main() {
}
vertex += blend_vertex;
- normal += normalize(normal + blend_normal);
- tangent.rgb += normalize(tangent.rgb + blend_tangent);
+ normal = normalize(normal + blend_normal);
+ tangent.rgb = normalize(tangent.rgb + blend_tangent);
}
if (params.has_skeleton) {