[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60840] trunk/blender/source/blender: Fix for wrong active render layer after copying hr scene

[Sergey Sharybin]

Revision: 60840
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60840
Author:   nazgul
Date:     2013-10-18 09:45:21 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
Fix for wrong active render layer after copying hr scene

Also fix crash for files which could have been saved with
wrong active render layer.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/editors/render/render_shading.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2013-10-18 07:38:08 UTC (rev 60839)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2013-10-18 09:45:21 UTC (rev 60840)
@@ -157,6 +157,7 @@
 		lb = scen->r.layers;
 		scen->r = sce->r;
 		scen->r.layers = lb;
+		scen->r.actlay = 0;
 		scen->unit = sce->unit;
 		scen->physics_settings = sce->physics_settings;
 		scen->gm = sce->gm;

Modified: trunk/blender/source/blender/editors/render/render_shading.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_shading.c	2013-10-18 07:38:08 UTC (rev 60839)
+++ trunk/blender/source/blender/editors/render/render_shading.c	2013-10-18 09:45:21 UTC (rev 60840)
@@ -739,6 +739,10 @@
 	Scene *scene = CTX_data_scene(C);
 	SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay);
 
+	if (!srl) {
+		return FALSE;
+	}
+
 	return BKE_freestyle_lineset_get_active(&srl->freestyleConfig) != NULL;
 }