Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / blenkernel / intern / particle.c
index 220068780a7782536e297bb334b4b74e8ff6b850..7c71df9fece0ee65e5d7aeed01e81ac87795067a 100644 (file)
@@ -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);
                                }