[Bf-blender-cvs] [51f77a10eb] render-layers: Fixup in doversioning

[Dalai Felinto]

Commit: 51f77a10eb2aa01136a468f9b6f9952f42c76f4f
Author: Dalai Felinto
Date:   Thu Jan 26 18:25:08 2017 +0100
Branches: render-layers
https://developer.blender.org/rB51f77a10eb2aa01136a468f9b6f9952f42c76f4f

Fixup in doversioning

===================================================================

M	source/blender/blenloader/intern/versioning_280.c

===================================================================

diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 28952795b4..bd6bb9eebf 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;