diff options
Diffstat (limited to 'source/blender/makesdna/DNA_particle_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 5952aa8afb0..ec2a724ac82 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -116,6 +116,9 @@ typedef struct ParticleData { float size; /* size and multiplier so that we can update size when ever */ + float sphdensity; /* density of sph particle */ + int pad; + int hair_index; short flag; short alive; /* the life state of a particle */ @@ -130,6 +133,8 @@ typedef struct SPHFluidSettings { float stiffness_k, stiffness_knear, rest_density; float buoyancy; int flag, spring_frames; + short solver; + short pad[3]; } SPHFluidSettings; /* fluid->flag */ @@ -141,6 +146,10 @@ typedef struct SPHFluidSettings { #define SPH_FAC_VISCOSITY 32 #define SPH_FAC_REST_LENGTH 64 +/* fluid->solver (numerical ID field, not bitfield) */ +#define SPH_SOLVER_DDR 0 +#define SPH_SOLVER_CLASSICAL 1 + typedef struct ParticleSettings { ID id; struct AnimData *adt; @@ -164,7 +173,8 @@ typedef struct ParticleSettings { /* adaptive path rendering */ short adapt_angle, adapt_pix; - short disp, omat, interpolation, rotfrom, integrator; + short disp, omat, interpolation, integrator; + short rotfrom DNA_DEPRECATED; short kink, kink_axis; /* billboards */ @@ -350,11 +360,6 @@ typedef struct ParticleSystem { #define PART_SELF_EFFECT (1<<22) -/* part->rotfrom */ -#define PART_ROT_KEYS 0 /* interpolate directly from keys */ -#define PART_ROT_ZINCR 1 /* same as zdir but done incrementally from previous position */ -#define PART_ROT_IINCR 2 /* same as idir but done incrementally from previous position */ - /* part->from */ #define PART_FROM_VERT 0 #define PART_FROM_FACE 1 |