summaryrefslogtreecommitdiff
path: root/scene/animation
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-01-30 10:03:49 +0100
committerRémi Verschelde <rverschelde@gmail.com>2023-01-30 10:03:49 +0100
commit38f8411ed82e72380c9ca77bf242e41277e026bb (patch)
tree8bc9155614f4e01e6bf6b04fd6014e80e0fc5306 /scene/animation
parent62b0bfd343fec874765c2d3801cb05bf97ecada3 (diff)
parent1c774a608314f4915791c9d9e4ab5d9c5485813f (diff)
Merge pull request #71964 from bruvzg/mat_key
Fix unsafe murmur3 hash use for the default material keys, expose alpha hash transparency mode for default materials and Label3D and Sprite3D.
Diffstat (limited to 'scene/animation')
-rw-r--r--scene/animation/root_motion_view.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/scene/animation/root_motion_view.cpp b/scene/animation/root_motion_view.cpp
index e6b258df3e..3d8d451c70 100644
--- a/scene/animation/root_motion_view.cpp
+++ b/scene/animation/root_motion_view.cpp
@@ -80,7 +80,8 @@ bool RootMotionView::get_zero_y() const {
void RootMotionView::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE: {
- immediate_material = StandardMaterial3D::get_material_for_2d(false, true, false, false, false);
+ immediate_material = StandardMaterial3D::get_material_for_2d(false, BaseMaterial3D::TRANSPARENCY_ALPHA, false);
+
first = true;
} break;