diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/makesdna/DNA_effect_types.h | |
parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_effect_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_effect_types.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h index 3455feea1a9..964b330a452 100644 --- a/source/blender/makesdna/DNA_effect_types.h +++ b/source/blender/makesdna/DNA_effect_types.h @@ -46,7 +46,7 @@ /* emit only from faces*/ #define PAF_OFACE 64 /* show emitter (don't hide actual mesh)*/ -#define PAF_SHOWE 128 +#define PAF_SHOWE 128 /* true random emit from faces (not just ordered jitter)*/ #define PAF_TRAND 256 /* even distribution in face emission based on face areas*/ @@ -78,15 +78,15 @@ typedef struct Effect { struct Effect *next, *prev; short type, flag, buttype, rt; - + } Effect; typedef struct BuildEff { struct BuildEff *next, *prev; short type, flag, buttype, rt; - + float len, sfra; - + } BuildEff; # @@ -102,40 +102,40 @@ struct Collection; typedef struct PartEff { struct PartEff *next, *prev; short type, flag, buttype, stype, vertgroup, userjit; - + float sta, end, lifetime; int totpart, totkey, seed; - + float normfac, obfac, randfac, texfac, randlife; float force[3]; float damp; - + float nabla, vectsize, maxlen, pad, defvec[3]; - + float mult[4], life[4]; short child[4], mat[4]; short texmap, curmult; short staticstep, omat, timetex, speedtex, flag2, flag2neg; short disp, vertgroup_v; - + char vgroupname[64], vgroupname_v[64]; /* MAX_VGROUP_NAME */ float imat[4][4]; /* inverse matrix of parent Object */ - + Particle *keys; struct Collection *group; - + } PartEff; typedef struct WaveEff { struct WaveEff *next, *prev; short type, flag, buttype, stype; - + float startx, starty, height, width; float narrow, speed, minfac, damp; - + float timeoffs, lifetime; - + } WaveEff; #endif |