diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-11 03:49:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-11 03:49:39 +0400 |
| commit | 75b393612809252349bf4062bc45df14c1a5dfe5 (patch) | |
| tree | 12650c13c6e927a9e084491aca3d09b77f4f4974 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | ceb9b237f224a480ef13ca151af07aa2d1e1ea60 (diff) | |
| parent | fbf3a76f1d4b50b81334f55efbff7a1e6ba1f413 (diff) | |
svn merge -r40075:40104 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 2a4eb3d4045..b683da9e256 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -74,6 +74,9 @@ typedef enum ModifierType { eModifierType_WeightVGEdit, eModifierType_WeightVGMix, eModifierType_WeightVGProximity, + eModifierType_NavMesh, + + /* BMESH ONLY - keeps getting bumped by new modifiers in trunk */ eModifierType_NgonInterp, NUM_MODIFIER_TYPES } ModifierType; @@ -756,6 +759,10 @@ typedef struct NgonInterpModifierData { int resolution, pad0; } NgonInterpModifierData; +typedef struct NavMeshModifierData { + ModifierData modifier; +} NavMeshModifierData; + typedef struct WarpModifierData { ModifierData modifier; /* keep in sync with MappingInfoModifierData */ |