Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_modifier_types.h2
-rw-r--r--source/blender/makesdna/DNA_particle_types.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index f001463944b..27e01cf7d29 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -565,7 +565,7 @@ typedef struct ClothModifierData {
struct PointCache *point_cache; /* definition is in DNA_object_force.h */
struct ListBase ptcaches;
/* XXX nasty hack, remove once hair can be separated from cloth modifier data */
- struct ClothHairRoot *roots;
+ struct ClothHairData *hairdata;
/* grid geometry values of hair continuum */
float hair_grid_min[3];
float hair_grid_max[3];
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 44ef2746159..0b1f85c043a 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -234,6 +234,10 @@ typedef struct ParticleSettings {
/* keyed particles */
int keyed_loops;
+ /* hair dynamics */
+ float bending_random;
+ int pad3;
+
struct MTex *mtex[18]; /* MAX_MTEX */
struct Group *dup_group;