Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h11
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 2b62f70c319..093ab2f6dc1 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -76,6 +76,9 @@ typedef enum ModifierType {
eModifierType_WeightVGProximity,
eModifierType_Ocean,
eModifierType_DynamicPaint,
+
+ /* BMESH ONLY - keeps getting bumped by new modifiers in trunk */
+ eModifierType_NgonInterp,
NUM_MODIFIER_TYPES
} ModifierType;
@@ -680,6 +683,7 @@ typedef struct ShrinkwrapModifierData {
#define MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS (1<<2)
#define MOD_SHRINKWRAP_PROJECT_OVER_NORMAL 0 /* projection over normal is used if no axis is selected */
+
typedef struct SimpleDeformModifierData {
ModifierData modifier;
@@ -812,9 +816,14 @@ typedef struct OceanModifierData {
#define MOD_OCEAN_GENERATE_NORMALS 2
-typedef struct WarpModifierData {
+/* BMESH_ONLY */
+typedef struct NgonInterpModifierData {
ModifierData modifier;
+ int resolution, pad0;
+} NgonInterpModifierData;
+typedef struct WarpModifierData {
+ ModifierData modifier;
/* keep in sync with MappingInfoModifierData */
struct Tex *texture;
struct Object *map_object;