diff options
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 73 |
1 files changed, 39 insertions, 34 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 27f9c9cd5f3..28840d55efc 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1,5 +1,4 @@ -/** - * +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -21,11 +20,16 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include "DNA_listBase.h" - #ifndef DNA_MODIFIER_TYPES_H #define DNA_MODIFIER_TYPES_H +/** \file DNA_modifier_types.h + * \ingroup DNA + */ + +#include "DNA_listBase.h" + + #define MODSTACK_DEBUG 1 /* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE! */ @@ -79,6 +83,7 @@ typedef enum ModifierMode { eModifierMode_OnCage = (1<<3), eModifierMode_Expanded = (1<<4), eModifierMode_Virtual = (1<<5), + eModifierMode_ApplyOnSpline = (1<<6), eModifierMode_DisableTemporary = (1 << 31) } ModifierMode; @@ -209,30 +214,32 @@ typedef struct ArrayModifierData { #define MOD_ARR_FITCURVE 2 /* ArrayModifierData->offset_type */ -#define MOD_ARR_OFF_CONST 1<<0 -#define MOD_ARR_OFF_RELATIVE 1<<1 -#define MOD_ARR_OFF_OBJ 1<<2 +#define MOD_ARR_OFF_CONST (1<<0) +#define MOD_ARR_OFF_RELATIVE (1<<1) +#define MOD_ARR_OFF_OBJ (1<<2) /* ArrayModifierData->flags */ -#define MOD_ARR_MERGE 1<<0 -#define MOD_ARR_MERGEFINAL 1<<1 +#define MOD_ARR_MERGE (1<<0) +#define MOD_ARR_MERGEFINAL (1<<1) typedef struct MirrorModifierData { ModifierData modifier; - short axis, flag; + short axis; /* deprecated, use flag instead */ + short flag; float tolerance; struct Object *mirror_ob; } MirrorModifierData; /* MirrorModifierData->flag */ -#define MOD_MIR_CLIPPING 1<<0 -#define MOD_MIR_MIRROR_U 1<<1 -#define MOD_MIR_MIRROR_V 1<<2 -#define MOD_MIR_AXIS_X 1<<3 -#define MOD_MIR_AXIS_Y 1<<4 -#define MOD_MIR_AXIS_Z 1<<5 -#define MOD_MIR_VGROUP 1<<6 +#define MOD_MIR_CLIPPING (1<<0) +#define MOD_MIR_MIRROR_U (1<<1) +#define MOD_MIR_MIRROR_V (1<<2) +#define MOD_MIR_AXIS_X (1<<3) +#define MOD_MIR_AXIS_Y (1<<4) +#define MOD_MIR_AXIS_Z (1<<5) +#define MOD_MIR_VGROUP (1<<6) +#define MOD_MIR_NO_MERGE (1<<7) typedef struct EdgeSplitModifierData { ModifierData modifier; @@ -242,8 +249,8 @@ typedef struct EdgeSplitModifierData { } EdgeSplitModifierData; /* EdgeSplitModifierData->flags */ -#define MOD_EDGESPLIT_FROMANGLE 1<<1 -#define MOD_EDGESPLIT_FROMFLAG 1<<2 +#define MOD_EDGESPLIT_FROMANGLE (1<<1) +#define MOD_EDGESPLIT_FROMFLAG (1<<2) typedef struct BevelModifierData { ModifierData modifier; @@ -330,7 +337,7 @@ typedef struct UVProjectModifierData { #define MOD_UVPROJECT_MAXPROJECTORS 10 /* UVProjectModifierData->flags */ -#define MOD_UVPROJECT_OVERRIDEIMAGE 1<<0 +#define MOD_UVPROJECT_OVERRIDEIMAGE (1<<0) typedef struct DecimateModifierData { ModifierData modifier; @@ -383,13 +390,13 @@ enum { }; /* WaveModifierData.flag */ -#define MOD_WAVE_X 1<<1 -#define MOD_WAVE_Y 1<<2 -#define MOD_WAVE_CYCL 1<<3 -#define MOD_WAVE_NORM 1<<4 -#define MOD_WAVE_NORM_X 1<<5 -#define MOD_WAVE_NORM_Y 1<<6 -#define MOD_WAVE_NORM_Z 1<<7 +#define MOD_WAVE_X (1<<1) +#define MOD_WAVE_Y (1<<2) +#define MOD_WAVE_CYCL (1<<3) +#define MOD_WAVE_NORM (1<<4) +#define MOD_WAVE_NORM_X (1<<5) +#define MOD_WAVE_NORM_Y (1<<6) +#define MOD_WAVE_NORM_Z (1<<7) typedef struct WaveModifierData { ModifierData modifier; @@ -547,12 +554,9 @@ typedef struct MeshDeformModifierData { } MeshDeformModifierData; typedef enum { - eParticleSystemFlag_Loaded = (1<<0), - eParticleSystemFlag_Pars = (1<<1), - eParticleSystemFlag_FromCurve = (1<<2), - eParticleSystemFlag_DM_changed = (1<<3), - eParticleSystemFlag_Disabled = (1<<4), - eParticleSystemFlag_psys_updated = (1<<5), + eParticleSystemFlag_Pars = (1<<0), + eParticleSystemFlag_psys_updated = (1<<1), + eParticleSystemFlag_file_loaded = (1<<2), } ParticleSystemModifierFlag; typedef struct ParticleSystemModifierData { @@ -584,7 +588,7 @@ typedef struct ParticleInstanceModifierData { typedef enum { eExplodeFlag_CalcFaces = (1<<0), eExplodeFlag_PaSize = (1<<1), - eExplodeFlag_EdgeSplit = (1<<2), + eExplodeFlag_EdgeCut = (1<<2), eExplodeFlag_Unborn = (1<<3), eExplodeFlag_Alive = (1<<4), eExplodeFlag_Dead = (1<<5), @@ -595,6 +599,7 @@ typedef struct ExplodeModifierData { int *facepa; short flag, vgroup; float protect; + char uvname[32]; } ExplodeModifierData; typedef struct MultiresModifierData { |