diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-17 18:10:19 +0300 |
commit | 06a1a66a9b6f120867d3bbebe3928744ec8e3495 (patch) | |
tree | 42e827a3cf58eb76474e479206b02a8d97dd3bf7 /source/blender/makesdna/DNA_modifier_types.h | |
parent | 61d27db35967710421ab92748e09624db068258d (diff) | |
parent | a24b4e6090057479796e914bc603119b12f6ca06 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index fd05f5584ec..d9792faf0cb 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -183,7 +183,7 @@ typedef struct BuildModifierData { float start, length; short flag; - + short randomize; /* (bool) whether order of vertices is randomized - legacy files (for readfile conversion) */ int seed; /* (int) random seed */ } BuildModifierData; @@ -620,7 +620,7 @@ typedef struct ClothModifierData { float hair_grid_max[3]; int hair_grid_res[3]; float hair_grid_cellsize; - + struct ClothSolverResult *solver_result; } ClothModifierData; @@ -968,7 +968,7 @@ typedef struct OceanModifierData { struct Ocean *ocean; struct OceanCache *oceancache; - + int resolution; int spatial_size; |