diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-04-07 16:55:10 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 16:55:10 -0300 |
| commit | fdfbff3cefe2e1dad0ac6d28d048af3c703d9a85 (patch) | |
| tree | 82a373cab0f6755e48043ae1231ef21f63c2d943 | |
| parent | d59ff07c1ee744f5edba56dcc0d23689ecfeaebc (diff) | |
| parent | 7061c28df7bac641351431af20342b44fc439fd5 (diff) | |
Merge pull request #17642 from brendor/master
Particles 2D and 3D - fix hue variation not working
| -rw-r--r-- | scene/3d/particles.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index 8617bbc2f6..693b416f6d 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -849,9 +849,9 @@ void ParticlesMaterial::_update_shader() { code += " vec4(1.250, -1.050, -0.203, 0.0),\n"; code += " vec4(0.000, 0.000, 0.000, 0.0)) * hue_rot_s;\n"; if (color_ramp.is_valid()) { - code += " COLOR = textureLod(color_ramp,vec2(CUSTOM.y,0.0),0.0) * hue_rot_mat;\n"; + code += " COLOR = hue_rot_mat * textureLod(color_ramp,vec2(CUSTOM.y,0.0),0.0);\n"; } else { - code += " COLOR = color_value * hue_rot_mat;\n"; + code += " COLOR = hue_rot_mat * color_value;\n"; } if (emission_color_texture.is_valid() && emission_shape >= EMISSION_SHAPE_POINTS) { code += " COLOR*= texelFetch(emission_texture_color,emission_tex_ofs,0);\n"; |