diff options
| author | clayjohn <claynjohn@gmail.com> | 2021-04-13 20:45:16 -0700 |
|---|---|---|
| committer | clayjohn <claynjohn@gmail.com> | 2021-04-14 20:24:03 -0700 |
| commit | 92731d292c66be637b837653044273c7000f63a3 (patch) | |
| tree | 0b03005c4150a89e09ea49ec64c51662c89a0267 /modules | |
| parent | b4b7c97d3839170180e4f3f7c2bd3179b374057a (diff) | |
| download | redot-engine-92731d292c66be637b837653044273c7000f63a3.tar.gz | |
Rename get_surface_material to get_surface_override_material
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gltf/gltf_document.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 0b70175a24..704656d132 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -4958,8 +4958,8 @@ GLTFMeshIndex GLTFDocument::_convert_mesh_instance(Ref<GLTFState> state, MeshIns if (godot_array_mesh.is_valid()) { surface_name = godot_array_mesh->surface_get_name(surface_i); } - if (p_mesh_instance->get_surface_material(surface_i).is_valid()) { - mat = p_mesh_instance->get_surface_material(surface_i); + if (p_mesh_instance->get_surface_override_material(surface_i).is_valid()) { + mat = p_mesh_instance->get_surface_override_material(surface_i); } if (p_mesh_instance->get_material_override().is_valid()) { mat = p_mesh_instance->get_material_override(); |