Skip to content

Fix duplicating ShaderMaterial reverts certain shader parameters #112294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix duplicating ShaderMaterial reverts certain shader parameters #112294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions scene/resources/material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,20 @@ bool ShaderMaterial::_can_use_render_priority() const {
return shader.is_valid() && shader->get_mode() == Shader::MODE_SPATIAL;
}

Ref<Resource> ShaderMaterial::_duplicate(const DuplicateParams &p_params) const {
Ref<ShaderMaterial> dup;
dup.instantiate();

dup->set_shader(shader);
dup->set_next_pass(get_next_pass());
dup->set_render_priority(get_render_priority());

dup->param_cache = param_cache;
dup->remap_cache = remap_cache;

return dup;
}

Shader::Mode ShaderMaterial::get_shader_mode() const {
if (shader.is_valid()) {
return shader->get_mode();
Expand Down
2 changes: 2 additions & 0 deletions scene/resources/material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,8 @@ class ShaderMaterial : public Material {
virtual RID get_rid() const override;
virtual RID get_shader_rid() const override;

virtual Ref<Resource> _duplicate(const DuplicateParams &p_params) const override;

ShaderMaterial();
~ShaderMaterial();
};
Expand Down