diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 13:53:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 13:53:21 +0300 |
| commit | 9d6a175756c8db989fc95bae47bbd1e77ff07980 (patch) | |
| tree | c60ad0c6318ac38cba576da2bfd3b792be787a1c /source/blender/makesdna/DNA_modifier_types.h | |
| parent | 0a679c6b685a4a046a9c4074cff8c508d6f91618 (diff) | |
| parent | da82269c58bd7ec1c0ebcb5e1433c731120ec389 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 283e801ea7a..64e6ce3d522 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -753,12 +753,21 @@ typedef enum { eParticleInstanceFlag_UseSize = (1 << 7), } ParticleInstanceModifierFlag; +typedef enum { + eParticleInstanceSpace_World = 0, + eParticleInstanceSpace_Local = 1, +} ParticleInstanceModifierSpace; + typedef struct ParticleInstanceModifierData { ModifierData modifier; struct Object *ob; - short psys, flag, axis, pad; + short psys, flag, axis, space; float position, random_position; + float rotation, random_rotation; + float particle_amount, particle_offset; + char index_layer_name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */ + char value_layer_name[64]; /* MAX_CUSTOMDATA_LAYER_NAME */ } ParticleInstanceModifierData; typedef enum { |