Merge pull request #47915 from BastiaanOlij/fix_surface_material_override

Fix forgotten rename on surface material override
This commit is contained in:
Rémi Verschelde 2021-04-15 13:03:24 +02:00 committed by GitHub
commit f109376a8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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;