godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Merge pull request #69527 from clayjohn/surface-name

Browse Source 
Index override surface name starting from 1 to match surface name
This commit is contained in:
Rémi Verschelde
2022-12-14 00:20:13 +01:00
parent f3080459d9 29dea68bab
commit db0b990e2c
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scene/3d/mesh_instance_3d.cpp
View File

@@ -52,11 +52,22 @@ bool MeshInstance3D::_set(const StringName &p_name, const Variant &p_value) {
if (p_name.operator String().begins_with("surface_material_override/")) { if (p_name.operator String().begins_with("surface_material_override/")) {
int idx = p_name.operator String().get_slicec('/', 1).to_int(); int idx = p_name.operator String().get_slicec('/', 1).to_int();
if (idx >= surface_override_materials.size() || idx < 0) {
// This is a bit of a hack to ensure compatibility with older material
// overrides that start indexing at 0.
// We assume that idx 0 is always read first, if its not, this won't work.
if (idx == 0) {
old_surface_index = true;
}
if (old_surface_index) {
idx++;
}
if (idx > surface_override_materials.size() || idx < 0) {
return false; return false;
} }
set_surface_override_material(idx, p_value); set_surface_override_material(idx - 1, p_value);
return true; return true;
} }
@@ -75,7 +86,7 @@ bool MeshInstance3D::_get(const StringName &p_name, Variant &r_ret) const {
} }
if (p_name.operator String().begins_with("surface_material_override/")) { if (p_name.operator String().begins_with("surface_material_override/")) {
int idx = p_name.operator String().get_slicec('/', 1).to_int(); int idx = p_name.operator String().get_slicec('/', 1).to_int() - 1;
if (idx >= surface_override_materials.size() || idx < 0) { if (idx >= surface_override_materials.size() || idx < 0) {
return false; return false;
} }
@@ -98,7 +109,7 @@ void MeshInstance3D::_get_property_list(List<PropertyInfo> *p_list) const {
} }
if (mesh.is_valid()) { if (mesh.is_valid()) {
for (int i = 0; i < mesh->get_surface_count(); i++) { for (int i = 1; i <= mesh->get_surface_count(); i++) {
p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("%s/%d", PNAME("surface_material_override"), i), PROPERTY_HINT_RESOURCE_TYPE, "BaseMaterial3D,ShaderMaterial", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DEFERRED_SET_RESOURCE)); p_list->push_back(PropertyInfo(Variant::OBJECT, vformat("%s/%d", PNAME("surface_material_override"), i), PROPERTY_HINT_RESOURCE_TYPE, "BaseMaterial3D,ShaderMaterial", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_DEFERRED_SET_RESOURCE));
} }
} }

1
scene/3d/mesh_instance_3d.h
View File

@@ -57,6 +57,7 @@ protected:
bool _set(const StringName &p_name, const Variant &p_value); bool _set(const StringName &p_name, const Variant &p_value);
bool _get(const StringName &p_name, Variant &r_ret) const; bool _get(const StringName &p_name, Variant &r_ret) const;
void _get_property_list(List<PropertyInfo> *p_list) const; void _get_property_list(List<PropertyInfo> *p_list) const;
bool old_surface_index = false;
void _notification(int p_what); void _notification(int p_what);
static void _bind_methods(); static void _bind_methods();