summaryrefslogtreecommitdiffstats
path: root/scene/resources/particles_material.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2022-05-24 08:15:33 +0200
committerGitHub <noreply@github.com>2022-05-24 08:15:33 +0200
commit1314e6cbcc7ccf19aeeafc01a12de1de6ce3642d (patch)
tree69df5d26b79ac73dcb57b494661889d1b256657a /scene/resources/particles_material.cpp
parentdb5a86339b9a5aba1a99d133ecfa3673f1ca1a97 (diff)
parenta8bbe570caadd0161a8db9c980296b111042a6b8 (diff)
downloadredot-engine-1314e6cbcc7ccf19aeeafc01a12de1de6ce3642d.tar.gz
Merge pull request #60803 from Chaosus/shader_hint_rename
Rename `hint_albedo`, `hint_white/black` in shaders
Diffstat (limited to 'scene/resources/particles_material.cpp')
-rw-r--r--scene/resources/particles_material.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp
index fced9e91c9..c4b15df6bb 100644
--- a/scene/resources/particles_material.cpp
+++ b/scene/resources/particles_material.cpp
@@ -197,14 +197,14 @@ void ParticlesMaterial::_update_shader() {
code += "uniform vec3 emission_box_extents;\n";
} break;
case EMISSION_SHAPE_DIRECTED_POINTS: {
- code += "uniform sampler2D emission_texture_normal : hint_black;\n";
+ code += "uniform sampler2D emission_texture_normal : hint_default_black;\n";
[[fallthrough]];
}
case EMISSION_SHAPE_POINTS: {
- code += "uniform sampler2D emission_texture_points : hint_black;\n";
+ code += "uniform sampler2D emission_texture_points : hint_default_black;\n";
code += "uniform int emission_texture_point_count;\n";
if (emission_color_texture.is_valid()) {
- code += "uniform sampler2D emission_texture_color : hint_white;\n";
+ code += "uniform sampler2D emission_texture_color : hint_default_white;\n";
}
} break;
case EMISSION_SHAPE_RING: {
@@ -228,7 +228,7 @@ void ParticlesMaterial::_update_shader() {
code += "uniform bool sub_emitter_keep_velocity;\n";
}
- code += "uniform vec4 color_value : hint_color;\n";
+ code += "uniform vec4 color_value : source_color;\n";
code += "uniform vec3 gravity;\n";