diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-26 07:13:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-26 07:13:54 +0400 |
commit | af7288c407fbb4bb462f509d5782b660a29c4883 (patch) | |
tree | 9c56d26ed78e2d93284d250c5b270518c329376f /source/blender/blenkernel/intern/particle.c | |
parent | 491526e5ed31bdba3e0a16e0ad6b8b59afb2f8d3 (diff) |
minor edit - weight_to_rgb() and ramp_blend() now take a float vector rather than 3 float pointers.
also make particle draw use a float vec.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 220068780a7..7c71df9fece 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -3170,13 +3170,13 @@ void psys_cache_edit_paths(Scene *scene, Object *ob, PTCacheEdit *edit, float cf float t2; if(k==0) { - weight_to_rgb(pind.hkey[1]->weight, ca->col, ca->col+1, ca->col+2); + weight_to_rgb(ca->col, pind.hkey[1]->weight); } else { float w1[3], w2[3]; keytime = (t - (*pind.ekey[0]->time))/((*pind.ekey[1]->time) - (*pind.ekey[0]->time)); - weight_to_rgb(pind.hkey[0]->weight, w1, w1+1, w1+2); - weight_to_rgb(pind.hkey[1]->weight, w2, w2+1, w2+2); + weight_to_rgb(w1, pind.hkey[0]->weight); + weight_to_rgb(w2, pind.hkey[1]->weight); interp_v3_v3v3(ca->col, w1, w2, keytime); } |