[Bf-blender-cvs] [6d68195a9b] render-layers: Doversion: set active object for "Render Layer"

Dalai Felinto noreply at git.blender.org
Wed Jan 11 12:59:03 CET 2017


Commit: 6d68195a9bf54151f0997d2ad45d3cf604083980
Author: Dalai Felinto
Date:   Wed Jan 11 12:54:59 2017 +0100
Branches: render-layers
https://developer.blender.org/rB6d68195a9bf54151f0997d2ad45d3cf604083980

Doversion: set active object for "Render Layer"

We don't do it for the other render layers (the ones converted from
SceneRenderLayer)

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

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 8059aab809..b8c854e931 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -120,6 +120,10 @@ void blo_do_versions_after_linking_280(Main *main)
 					lc = lc->next;
 				}
 
+				if (scene->basact) {
+					sl->basact = BKE_scene_layer_base_find(sl, scene->basact->object);
+				}
+
 				/* TODO: copy scene render data to layer */
 
 				/* Cleanup */




More information about the Bf-blender-cvs mailing list