diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-04 09:39:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-04 09:39:56 +0400 |
commit | 0bdbdc35b09a671220f830a52be8c1ba0cb3db10 (patch) | |
tree | d06ae5fab86ef02a65001c96ef73195f7c07870d /source/blender/makesdna/DNA_modifier_types.h | |
parent | 520cb6f452abe67492622f93292525870f6807af (diff) |
de-duplicate wave modifier texture function.
cmon - copying large functions between files is obviously stupid, dont do it!
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 3a9c742fe12..77fa03aeedc 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -313,13 +313,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 */ @@ -413,20 +413,22 @@ typedef struct CastModifierData { 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; @@ -815,19 +817,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 |