diff options
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 76f6b980aa2..1fa17760e8d 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -503,12 +503,14 @@ typedef enum { eParticleInstanceFlag_Unborn = (1<<3), eParticleInstanceFlag_Alive = (1<<4), eParticleInstanceFlag_Dead = (1<<5), + eParticleInstanceFlag_KeepShape = (1<<6), } ParticleInstanceModifierFlag; typedef struct ParticleInstanceModifierData { ModifierData modifier; struct Object *ob; - short psys, flag, rt[2]; + short psys, flag, axis, rt; + float position, random_position; } ParticleInstanceModifierData; typedef enum { diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 05f1cc1f351..c793362c223 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -131,7 +131,7 @@ typedef struct ParticleSettings { /* general values */ float sta, end, lifetime, randlife; - float timetweak, jitfac, keyed_time, eff_hair, rt; + float timetweak, jitfac, keyed_time, eff_hair; int totpart, userjit, grid_res; /* initial velocity factors */ @@ -159,6 +159,8 @@ typedef struct ParticleSettings { float branch_thres; /* drawing stuff */ float draw_line[2]; + float path_start, path_end; + int trail_count; /* boids */ float max_vel, max_lat_acc, max_tan_acc; @@ -311,8 +313,8 @@ typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in #define PART_DRAW_SIZE 4 #define PART_DRAW_EMITTER 8 /* render emitter also */ //#define PART_DRAW_HEALTH 16 -//#define PART_DRAW_TIMED_PATH 32 -//#define PART_DRAW_CACHED_PATH 64 +#define PART_ABS_PATH_TIME 32 +//#define PART_DRAW_TRAIL 64 #define PART_DRAW_BB_LOCK 128 #define PART_DRAW_PARENT 256 #define PART_DRAW_NUM 512 |