diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-04 10:20:10 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-04 10:20:10 +0400 |
commit | d0cdefd9fa37bf6788dad27b87d8d569c58ad94a (patch) | |
tree | 8807f7717662ad96cf6ad1d8df0a5caa12162361 /source/blender/makesdna/DNA_modifier_types.h | |
parent | 8d8403c15ec8694d7d71d8a9f4a9e3a1fade666e (diff) | |
parent | 434c1e6df82a082fe03034a3ad3825f7b50ea533 (diff) |
svn merge ^/trunk/blender -r43092:43092
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index dd68694404d..2d6143a1bc2 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -316,13 +316,13 @@ typedef struct DisplaceModifierData { char uvlayer_name[32]; int uvlayer_tmp; int texmapping; - int pad10; /* end MappingInfoModifierData */ float strength; int direction; char defgrp_name[32]; float midlevel; + int pad; } DisplaceModifierData; /* DisplaceModifierData->direction */ @@ -339,7 +339,7 @@ enum { MOD_DISP_MAP_LOCAL, MOD_DISP_MAP_GLOBAL, MOD_DISP_MAP_OBJECT, - MOD_DISP_MAP_UV, + MOD_DISP_MAP_UV }; typedef struct UVProjectModifierData { @@ -404,13 +404,6 @@ typedef struct CastModifierData { short flag, type; } CastModifierData; -enum { - MOD_WAV_MAP_LOCAL, - MOD_WAV_MAP_GLOBAL, - MOD_WAV_MAP_OBJECT, - MOD_WAV_MAP_UV, -}; - /* WaveModifierData.flag */ #define MOD_WAVE_X (1<<1) #define MOD_WAVE_Y (1<<2) @@ -423,20 +416,22 @@ enum { typedef struct WaveModifierData { ModifierData modifier; - struct Object *objectcenter; - char defgrp_name[32]; + /* keep in sync with MappingInfoModifierData */ struct Tex *texture; struct Object *map_object; + char uvlayer_name[32]; + int uvlayer_tmp; + int texmapping; + /* end MappingInfoModifierData */ + + struct Object *objectcenter; + char defgrp_name[32]; short flag, pad; float startx, starty, height, width; float narrow, speed, damp, falloff; - int texmapping, uvlayer_tmp; - - char uvlayer_name[32]; - float timeoffs, lifetime; float pad1; } WaveModifierData; @@ -831,19 +826,17 @@ typedef struct WarpModifierData { char uvlayer_name[32]; int uvlayer_tmp; int texmapping; - int pad10; /* end MappingInfoModifierData */ - float strength; - struct Object *object_from; struct Object *object_to; struct CurveMapping *curfalloff; char defgrp_name[32]; /* optional vertexgroup name */ + float strength; float falloff_radius; char flag; /* not used yet */ char falloff_type; - char pad[2]; + char pad[6]; } WarpModifierData; #define MOD_WARP_VOLUME_PRESERVE 1 |