godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70466 from clayjohn/material-override 

Remove compatibility code for MeshInstance3D surface override material
This commit is contained in:
Rémi Verschelde 2022-12-23 09:11:26 +01:00
parent 6ff74f07f0 1cc232ea4e
commit 58d19d713d
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scene/3d/mesh_instance_3d.cpp
View File

@ -53,18 +53,7 @@ bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) {
if (p_name.operator String().begins_with("surface_material_override/")) {
int idx = p_name.operator String().get_slicec('/', 1).to_int();
// This is a bit of a hack to ensure compatibility with material
// overrides that start indexing at 1.
// We assume that idx 0 is always read first, if its not, this won't work.
if (idx == 0) {
surface_index_0 = true;
}
if (!surface_index_0) {
// This means the file was created when the indexing started at 1, so decrease by one.
idx--;
}
if (idx > surface_override_materials.size() || idx < 0) {
if (idx >= surface_override_materials.size() || idx < 0) {
return false;
}