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.h | |
| 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.h')
| -rw-r--r-- | servers/rendering/renderer_scene_cull.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/rendering/renderer_scene_cull.h b/servers/rendering/renderer_scene_cull.h index 32f4334288..d7d59665ec 100644 --- a/servers/rendering/renderer_scene_cull.h +++ b/servers/rendering/renderer_scene_cull.h @@ -840,7 +840,7 @@ public: virtual void instance_set_transform(RID p_instance, const Transform &p_transform); virtual void instance_attach_object_instance_id(RID p_instance, ObjectID p_id); virtual void instance_set_blend_shape_weight(RID p_instance, int p_shape, float p_weight); - virtual void instance_set_surface_material(RID p_instance, int p_surface, RID p_material); + virtual void instance_set_surface_override_material(RID p_instance, int p_surface, RID p_material); virtual void instance_set_visible(RID p_instance, bool p_visible); virtual void instance_set_custom_aabb(RID p_instance, AABB p_aabb); |