Merged changes in the trunk up to revision 42116.
[blender.git] / source / blender / blenkernel / BKE_particle.h
index c66e49f29069e499cc1964e18aae1902048da0b6..f491761f3f2abd64e12fc6266f36b8b38f6d6f8f 100644 (file)
@@ -217,7 +217,7 @@ typedef struct ParticleDrawData {
        float *ndata, *nd;              /* normal data */
        float *cdata, *cd;              /* color data */
        float *vedata, *ved;    /* velocity data */
-       float *ma_r, *ma_g, *ma_b;
+       float *ma_col;
        int tot_vec_size, flag;
        int totpoint, totve;
 } ParticleDrawData;