diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 13:05:36 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-08-12 13:05:36 +0300 |
| commit | 27b28e437d974ebbafa234205941c07aa0ab546c (patch) | |
| tree | 9b05345e464e13352def8a25abafe246c451a9e1 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | 4a920429161083c54805762298786a27a0d99e1c (diff) | |
| parent | f854fefa1796429907c2574ba414335eb5519714 (diff) | |
Merge branch 'tmp_hair_curves' into hair_guides
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index a04ad732ee7..e3d02cdc0c8 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -1640,16 +1640,16 @@ enum { (MOD_MESHSEQ_READ_VERT | MOD_MESHSEQ_READ_POLY | MOD_MESHSEQ_READ_UV | MOD_MESHSEQ_READ_COLOR) /* Hair modifier */ -typedef struct HairModifierGuideCurve { - struct HairModifierGuideCurve *next, *prev; +typedef struct HairModifierFiberCurve { + struct HairModifierFiberCurve *next, *prev; /* Index for the mesh sample buffer */ int mesh_sample_index; /* Number of vertices in the curve */ int numverts; /* Vertex array */ - struct HairGuideVertex *verts; -} HairModifierGuideCurve; + struct HairFiberVertex *verts; +} HairModifierFiberCurve; typedef struct HairModifierData { ModifierData modifier; @@ -1664,7 +1664,7 @@ typedef struct HairModifierData { int follicle_seed; int follicle_count; - ListBase guide_curves; + ListBase fiber_curves; } HairModifierData; #endif /* __DNA_MODIFIER_TYPES_H__ */ |