diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-15 07:57:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-15 07:57:15 +0200 |
| commit | c7a4e2196ee08d7ec5190873bd243fbf2727c18f (patch) | |
| tree | b1272043f63d4c8b003e20097f7709e2748b2a94 /servers/rendering/renderer_scene_cull.cpp | |
| parent | 9e0f87359b9ae596fa99022ccdad015bd74680ae (diff) | |
| parent | 92731d292c66be637b837653044273c7000f63a3 (diff) | |
Merge pull request #47878 from clayjohn/rename-get_surface_material
Rename get_surface_material to get_surface_override_material
Diffstat (limited to 'servers/rendering/renderer_scene_cull.cpp')
| -rw-r--r-- | servers/rendering/renderer_scene_cull.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp index e8155e4025..2c865186b4 100644 --- a/servers/rendering/renderer_scene_cull.cpp +++ b/servers/rendering/renderer_scene_cull.cpp @@ -752,7 +752,7 @@ void RendererSceneCull::instance_set_blend_shape_weight(RID p_instance, int p_sh } } -void RendererSceneCull::instance_set_surface_material(RID p_instance, int p_surface, RID p_material) { +void RendererSceneCull::instance_set_surface_override_material(RID p_instance, int p_surface, RID p_material) { Instance *instance = instance_owner.getornull(p_instance); ERR_FAIL_COND(!instance); |