summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Marques <george@gmarqu.es>2016-12-05 22:18:03 -0200
committerGitHub <noreply@github.com>2016-12-05 22:18:03 -0200
commitedddee5d45f4493de2d1fe456bfb435df748dcae (patch)
tree40db2c99dcd472d81adcadf3f6428793e678bb84
parent4235abe8dc9918d479229e6703d18e2b801011c3 (diff)
parent4dd6bead1fc5cfe264e24964f9da0d35bc74b3ee (diff)
Merge pull request #7237 from Hinsbart/rand_initial_size
Particles2D: Fix initial size randomness property having no effect.
-rw-r--r--scene/2d/particles_2d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/particles_2d.cpp b/scene/2d/particles_2d.cpp
index 29dad630d6..3101f616d6 100644
--- a/scene/2d/particles_2d.cpp
+++ b/scene/2d/particles_2d.cpp
@@ -563,7 +563,7 @@ void Particles2D::_notification(int p_what) {
}
}
- float initial_size = param[PARAM_INITIAL_SIZE]+param[PARAM_INITIAL_SIZE]*_rand_from_seed(&rand_seed)*randomness[PARAM_FINAL_SIZE];
+ float initial_size = param[PARAM_INITIAL_SIZE]+param[PARAM_INITIAL_SIZE]*_rand_from_seed(&rand_seed)*randomness[PARAM_INITIAL_SIZE];
float final_size = param[PARAM_FINAL_SIZE]+param[PARAM_FINAL_SIZE]*_rand_from_seed(&rand_seed)*randomness[PARAM_FINAL_SIZE];
float size_mult=initial_size*(1.0-ptime) + final_size*ptime;