diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-12 12:23:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 12:23:34 +0100 |
| commit | a54bd6e868a3cbaf8c9033815a798a3f5c1107ef (patch) | |
| tree | 819476e2f71099a386b3e7dccd548818ddca0143 /servers/rendering/renderer_rd/renderer_scene_render_rd.h | |
| parent | 55b49dc71b687b9edf640ae2264879852f0b0503 (diff) | |
| parent | 826e781bfa90f55eed579e9b512a19b0c1c19ba4 (diff) | |
| download | redot-engine-a54bd6e868a3cbaf8c9033815a798a3f5c1107ef.tar.gz | |
Merge pull request #53914 from Chaosus/shader_default_texture_param
Diffstat (limited to 'servers/rendering/renderer_rd/renderer_scene_render_rd.h')
| -rw-r--r-- | servers/rendering/renderer_rd/renderer_scene_render_rd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering/renderer_rd/renderer_scene_render_rd.h b/servers/rendering/renderer_rd/renderer_scene_render_rd.h index baa0144d43..740e0e75ce 100644 --- a/servers/rendering/renderer_rd/renderer_scene_render_rd.h +++ b/servers/rendering/renderer_rd/renderer_scene_render_rd.h @@ -879,12 +879,12 @@ private: String path; String code; - Map<StringName, RID> default_texture_params; + Map<StringName, Map<int, RID>> default_texture_params; bool uses_time; virtual void set_code(const String &p_Code); - virtual void set_default_texture_param(const StringName &p_name, RID p_texture); + virtual void set_default_texture_param(const StringName &p_name, RID p_texture, int p_index); virtual void get_param_list(List<PropertyInfo> *p_param_list) const; virtual void get_instance_param_list(List<RendererStorage::InstanceShaderParam> *p_param_list) const; virtual bool is_param_texture(const StringName &p_param) const; |