summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-04-15 13:03:24 +0200
committerGitHub <noreply@github.com>2021-04-15 13:03:24 +0200
commitf109376a8c2ffab8132d58591f9299cf09ca4a7e (patch)
treea94388587a26b32e7b84fea3d83eca29253e897f /scene
parentc7a4e2196ee08d7ec5190873bd243fbf2727c18f (diff)
parenteca20c2038ebb9975f587060a89ef77ef90b57dd (diff)
Merge pull request #47915 from BastiaanOlij/fix_surface_material_override
Fix forgotten rename on surface material override
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/mesh_instance_3d.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/mesh_instance_3d.cpp b/scene/3d/mesh_instance_3d.cpp
index bee6d4be36..7623ede0fc 100644
--- a/scene/3d/mesh_instance_3d.cpp
+++ b/scene/3d/mesh_instance_3d.cpp
@@ -51,7 +51,7 @@ bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) {
return true;
}
- if (p_name.operator String().begins_with("material/")) {
+ if (p_name.operator String().begins_with("surface_material_override/")) {
int idx = p_name.operator String().get_slicec('/', 1).to_int();
if (idx >= surface_override_materials.size() || idx < 0) {
return false;
@@ -75,7 +75,7 @@ bool MeshInstance3D::_get(const StringName &p_name, Variant &r_ret) const {
return true;
}
- if (p_name.operator String().begins_with("material/")) {
+ if (p_name.operator String().begins_with("surface_material_override/")) {
int idx = p_name.operator String().get_slicec('/', 1).to_int();
if (idx >= surface_override_materials.size() || idx < 0) {
return false;