diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-11-07 09:02:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-07 09:02:09 +0300 |
| commit | 322cec8e4d16340a7b167066c6ba2eb6c2a19b8e (patch) | |
| tree | 0e88de2ca44f8b81a8af1b349749c4fd96ac8b97 /source/blender/blenloader | |
| parent | af33dbd7145098fecf32d7a0b57c93d3cb63dc18 (diff) | |
| parent | 79b703bb635ea719bbe31c1ece9884d2d298eaef (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 3866878b12a..452e75081d6 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3862,6 +3862,8 @@ static void direct_link_armature(FileData *fd, bArmature *arm) link_list(fd, &arm->bonebase); arm->bonehash = NULL; arm->edbo = NULL; + /* Must always be cleared (armatures don't have their own edit-data). */ + arm->needs_flush_to_id = 0; arm->adt = newdataadr(fd, arm->adt); direct_link_animdata(fd, arm->adt); @@ -4079,6 +4081,8 @@ static void direct_link_mball(FileData *fd, MetaBall *mb) BLI_listbase_clear(&mb->disp); mb->editelems = NULL; + /* Must always be cleared (meta's don't have their own edit-data). */ + mb->needs_flush_to_id = 0; /* mb->edit_elems.first= mb->edit_elems.last= NULL;*/ mb->lastelem = NULL; mb->batch_cache = NULL; |