summaryrefslogtreecommitdiff
path: root/scene/resources/material.h
diff options
context:
space:
mode:
authorbruvzg <7645683+bruvzg@users.noreply.github.com>2023-01-24 12:24:53 +0200
committerbruvzg <7645683+bruvzg@users.noreply.github.com>2023-01-24 12:24:53 +0200
commit1c774a608314f4915791c9d9e4ab5d9c5485813f (patch)
tree1cc2f2c71eb9710c4a9613c5ee8d0d8b6bf09e8c /scene/resources/material.h
parent4fa6edc888cfacd5346bf08afa14b5f5a9bd6d0c (diff)
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/resources/material.h')
-rw-r--r--scene/resources/material.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/material.h b/scene/resources/material.h
index fe1448cd4c..23f3a8824d 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -760,7 +760,7 @@ public:
static void finish_shaders();
static void flush_changes();
- static Ref<Material> get_material_for_2d(bool p_shaded, bool p_transparent, bool p_double_sided, bool p_cut_alpha, bool p_opaque_prepass, bool p_billboard = false, bool p_billboard_y = false, bool p_msdf = false, bool p_no_depth = false, bool p_fixed_size = false, TextureFilter p_filter = TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RID *r_shader_rid = nullptr);
+ static Ref<Material> get_material_for_2d(bool p_shaded, Transparency p_transparency, bool p_double_sided, bool p_billboard = false, bool p_billboard_y = false, bool p_msdf = false, bool p_no_depth = false, bool p_fixed_size = false, TextureFilter p_filter = TEXTURE_FILTER_LINEAR_WITH_MIPMAPS, RID *r_shader_rid = nullptr);
virtual RID get_shader_rid() const override;