diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-26 20:25:08 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-26 20:25:08 +0300 |
commit | 51f77a10eb2aa01136a468f9b6f9952f42c76f4f (patch) | |
tree | 32d6c953b40d0fb958ae79840d72f61cfa7207b0 | |
parent | e3469271110da75f8c213a5505c2bfcdb77331b2 (diff) |
Fixup in doversioning
-rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 28952795b41..bd6bb9eebf0 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -126,6 +126,9 @@ void blo_do_versions_after_linking_280(Main *main) lc = lc->next; } + /* but we still need to make the flags synced */ + BKE_scene_layer_base_flag_recalculate(sl); + /* convert active base */ if (scene->basact) { sl->basact = BKE_scene_layer_base_find(sl, scene->basact->object); @@ -135,7 +138,9 @@ void blo_do_versions_after_linking_280(Main *main) for (Base *base = scene->base.first; base; base = base->next) { ObjectBase *ob_base = BKE_scene_layer_base_find(sl, base->object); if ((base->flag & SELECT) != 0) { - ob_base->flag |= BASE_SELECTED; + if ((ob_base->flag & BASE_SELECTABLED) != 0) { + ob_base->flag |= BASE_SELECTED; + } } else { ob_base->flag &= ~BASE_SELECTED; |