diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-10 13:41:32 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-10 13:41:32 +0300 |
| commit | 6371f8ff8add8e64213496a0de153715ca794d39 (patch) | |
| tree | d3bdf9bc8b5a96b23f7dc4c6a8283fda06d7c461 /source/blender/makesdna/DNA_modifier_types.h | |
| parent | ecbad54df91e4eacb6fb5404bc6338ee4c052e0a (diff) | |
| parent | 109192b3601ddfa8ec44ab2fd276298ac690a9a2 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'source/blender/makesdna/DNA_modifier_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index a02948ddc92..87321e9fd93 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -619,6 +619,9 @@ typedef struct CollisionModifierData { unsigned int mvert_num; unsigned int tri_num; float time_x, time_xnew; /* cfra time of modifier */ + char is_static; /* collider doesn't move this frame, i.e. x[].co==xnew[].co */ + char pad[7]; + struct BVHTree *bvhtree; /* bounding volume hierarchy for this cloth object */ } CollisionModifierData; |