diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-08-22 13:31:32 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-08-22 13:31:32 +0400 |
| commit | 5dafc1a5530466c421c2c80eb2f06ba34bd21cb9 (patch) | |
| tree | 859b64e4181fb48ac189219cf205fdde7de92de0 /source/blender/makesdna/DNA_ipo_types.h | |
| parent | c5d902133f03c6740aea6801940b022f615ca0d5 (diff) | |
| parent | eab746fc5facc02e9885570c1f05e753278cbc33 (diff) | |
svn merge -r 16060:16222 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_ipo_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_ipo_types.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_ipo_types.h b/source/blender/makesdna/DNA_ipo_types.h index 09f4509df80..6149db21db0 100644 --- a/source/blender/makesdna/DNA_ipo_types.h +++ b/source/blender/makesdna/DNA_ipo_types.h @@ -359,8 +359,8 @@ typedef short IPO_Channel; /* ******************** */ /* particle ipos */ -#define PART_TOTIPO 19 -#define PART_TOTNAM 19 +#define PART_TOTIPO 25 +#define PART_TOTNAM 25 #define PART_EMIT_FREQ 1 #define PART_EMIT_LIFE 2 @@ -386,6 +386,14 @@ typedef short IPO_Channel; #define PART_BB_TILT 19 +#define PART_PD_FSTR 20 +#define PART_PD_FFALL 21 +#define PART_PD_FMAXD 22 + +#define PART_PD2_FSTR 23 +#define PART_PD2_FFALL 24 +#define PART_PD2_FMAXD 25 + /* these are IpoCurve specific */ /* **************** IPO ********************* */ |