diff options
author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
---|---|---|
committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/makesdna/DNA_modifier_types.h | |
parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 59ce965b582..2f89a83d42d 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -819,16 +819,21 @@ enum { MOD_SOLIDIFY_FLIP = (1 << 5), }; +#if (DNA_DEPRECATED_GCC_POISON == 1) +#pragma GCC poison MOD_SOLIDIFY_RIM_MATERIAL +#endif + typedef struct ScrewModifierData { ModifierData modifier; struct Object *ob_axis; - int steps; - int render_steps; - int iter; + unsigned int steps; + unsigned int render_steps; + unsigned int iter; float screw_ofs; float angle; - short axis; + char axis; + char pad; short flag; } ScrewModifierData; @@ -838,6 +843,8 @@ enum { MOD_SCREW_OBJECT_OFFSET = (1 << 2), /* MOD_SCREW_OBJECT_ANGLE = (1 << 4), */ MOD_SCREW_SMOOTH_SHADING = (1 << 5), + MOD_SCREW_UV_STRETCH_U = (1 << 6), + MOD_SCREW_UV_STRETCH_V = (1 << 7), }; typedef struct OceanModifierData { @@ -1187,6 +1194,10 @@ enum { MOD_TRIANGULATE_BEAUTY = (1 << 0), /* deprecated */ }; +#if (DNA_DEPRECATED_GCC_POISON == 1) +#pragma GCC poison MOD_TRIANGULATE_BEAUTY +#endif + /* Triangulate methods - NGons */ enum { MOD_TRIANGULATE_NGON_BEAUTY = 0, @@ -1310,4 +1321,20 @@ enum { }; +typedef struct LaplacianDeformModifierData { + ModifierData modifier; + char anchor_grp_name[64]; /* MAX_VGROUP_NAME */ + int total_verts, repeat; + float *vertexco; + void *cache_system; /* runtime only */ + short flag, pad[3]; + +} LaplacianDeformModifierData; + +/* Smooth modifier flags */ +enum { + MOD_LAPLACIANDEFORM_BIND = 1, +}; + + #endif /* __DNA_MODIFIER_TYPES_H__ */ |