diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-11-04 11:18:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-11-04 11:18:29 +0400 |
commit | fae6c35ca7ae4e73cc32a0f5c235fd0ff8f00be1 (patch) | |
tree | 7caea3d796c18cddf661960a243de565847173c5 /source/blender/blenkernel/intern/particle_system.c | |
parent | 89a454653e9ff7704671aeb371b1b387af6152dc (diff) |
code cleanup: quiet -Wdouble-promotion, disabled this warnings for a few files since its done throughout the code in some places.
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index e959ef35cb0..2b95946f571 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -1282,7 +1282,7 @@ static int distribute_threads_init_data(ParticleThread *threads, Scene *scene, D i= 0; for (p=0; p<totpart; p++, pos+=step) { - while ((i < totelem) && (pos > element_sum[i+1])) + while ((i < totelem) && (pos > (double)element_sum[i + 1])) i++; particle_element[p] = MIN2(totelem-1, i); |