diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2018-11-13 20:45:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-13 20:45:26 +0100 |
commit | df5829e93757c3b0639b9ea000816795119b4d9e (patch) | |
tree | e8bca4df532448fcedb1642beb6f62a03d222559 | |
parent | 072aaf98e8c51d4746475f613439c2c152536f92 (diff) | |
parent | 4e5ef43dbb218d07733708dec7aff4d5db382251 (diff) |
Merge pull request #23683 from akien-mga/particles-param-scale-texture
ParticlesMaterial: Simplify PARAM_SCALE texture validation
-rw-r--r-- | scene/resources/particles_material.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/scene/resources/particles_material.cpp b/scene/resources/particles_material.cpp index d500609c43..b3fc13b79e 100644 --- a/scene/resources/particles_material.cpp +++ b/scene/resources/particles_material.cpp @@ -797,12 +797,7 @@ void ParticlesMaterial::set_param_texture(Parameter p_param, const Ref<Texture> } break; case PARAM_SCALE: { VisualServer::get_singleton()->material_set_param(_get_material(), shader_names->scale_texture, p_texture); - - Ref<CurveTexture> curve_tex = p_texture; - if (curve_tex.is_valid()) { - curve_tex->ensure_default_setup(); - } - + _adjust_curve_range(p_texture, 0, 1); } break; case PARAM_HUE_VARIATION: { VisualServer::get_singleton()->material_set_param(_get_material(), shader_names->hue_variation_texture, p_texture); |