tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-11 16:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47878 from clayjohn/rename-get_surface_material

Browse Source 
Rename get_surface_material to get_surface_override_material
This commit is contained in:
Rémi Verschelde
2021-04-15 07:57:15 +02:00
committed by GitHub
parent 9e0f87359b 92731d292c
commit c7a4e2196e
16 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gltf/gltf_document.cpp
+2 -2
View File
@@ -4959,8 +4959,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();