archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Layers: set active object in doversion for all render layers

Browse Source
This commit is contained in:
Dalai Felinto
2017-02-09 15:57:06 +01:00
parent 5bee553b1f
commit cb490561d3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/blenloader/intern/versioning_280.c
View File

@@ -69,7 +69,7 @@ void do_versions_after_linking_280(Main *main)
is_visible[i] = (scene->lay & (1 << i));
}
for (BaseLegacy *base = scene->base.first; base; base = base->next) {
for (Base *base = scene->base.first; base; base = base->next) {
lay_used |= base->lay & ((1 << 20) - 1); /* ignore localview */
for (int i = 0; i < 20; i++) {
@@ -108,6 +108,11 @@ void do_versions_after_linking_280(Main *main)
}
}
/* for convenience set the same active object in all the layers */
if (scene->basact) {
sl->basact = BKE_scene_layer_base_find(sl, scene->basact->object);
}
/* TODO: passes, samples, mask_layesr, exclude, ... */
}
@@ -136,7 +141,7 @@ void do_versions_after_linking_280(Main *main)
}
/* convert selected bases */
for (BaseLegacy *base = scene->base.first; base; base = base->next) {
for (Base *base = scene->base.first; base; base = base->next) {
Base *ob_base = BKE_scene_layer_base_find(sl, base->object);
if ((base->flag & SELECT) != 0) {
if ((ob_base->flag & BASE_SELECTABLED) != 0) {
@@ -158,7 +163,7 @@ void do_versions_after_linking_280(Main *main)
}
/* remove bases once and for all */
for (BaseLegacy *base = scene->base.first; base; base = base->next) {
for (Base *base = scene->base.first; base; base = base->next) {
id_us_min(&base->object->id);
}
BLI_freelistN(&scene->base);