diff options
Diffstat (limited to 'source/blender/makesdna/DNA_gpencil_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_modifier_types.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index 125423cd061..5d35db1a960 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -24,6 +24,8 @@ #include "DNA_defs.h" #include "DNA_listBase.h" +struct LatticeDeformData; + /* WARNING ALERT! TYPEDEF VALUES ARE WRITTEN IN FILES! SO DO NOT CHANGE! * (ONLY ADD NEW ITEMS AT THE END) */ @@ -56,7 +58,7 @@ typedef enum GpencilModifierMode { eGpencilModifierMode_Realtime = (1 << 0), eGpencilModifierMode_Render = (1 << 1), eGpencilModifierMode_Editmode = (1 << 2), - eGpencilModifierMode_Expanded = (1 << 3), + eGpencilModifierMode_Expanded_DEPRECATED = (1 << 3), } GpencilModifierMode; typedef enum { @@ -70,7 +72,7 @@ typedef struct GpencilModifierData { int type, mode; int stackindex; short flag; - short _pad; + short ui_expand_flag; /** MAX_NAME. */ char name[64]; @@ -445,8 +447,8 @@ typedef struct LatticeGpencilModifierData { float strength; /** Custom index for passes. */ int layer_pass; - /** Runtime only (LatticeDeformData). */ - void *cache_data; + /** Runtime only. */ + struct LatticeDeformData *cache_data; } LatticeGpencilModifierData; typedef enum eLatticeGpencil_Flag { @@ -655,12 +657,12 @@ typedef enum eSmoothGpencil_Flag { typedef struct ArmatureGpencilModifierData { GpencilModifierData modifier; - /** Deformflag replaces armature->deformflag. */ + /** #eArmature_DeformFlag use instead of #bArmature.deformflag. */ short deformflag, multi; int _pad; struct Object *object; - /** Stored input of previous modifier, for vertexgroup blending. */ - float *prevCos; + /** Stored input of previous modifier, for vertex-group blending. */ + float (*vert_coords_prev)[3]; /** MAX_VGROUP_NAME. */ char vgname[64]; |