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/blenloader/intern | |
| 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/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 03fcf336700..7048e6d7e9b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -4824,6 +4824,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) collmd->time_x = collmd->time_xnew = -1000; collmd->mvert_num = 0; collmd->tri_num = 0; + collmd->is_static = false; collmd->bvhtree = NULL; collmd->tri = NULL; |