[Bf-blender-cvs] [2842b0e] master: Revert previous commit (sorry about that), and use standard func to get active layer in this case too.

[Bastien Montagne]

Commit: 2842b0e9c99a5fda85231b44de5f1f17d0e402f2
Author: Bastien Montagne
Date:   Mon Sep 29 14:22:50 2014 +0200
Branches: master
https://developer.blender.org/rB2842b0e9c99a5fda85231b44de5f1f17d0e402f2

Revert previous commit (sorry about that), and use standard func to get active layer
in this case too.

Thanks to Campbell for the head up.

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

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

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3833846..7aadf4a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -8996,10 +8996,10 @@ static ID *append_named_part_ex(const bContext *C, Main *mainl, FileData *fd, co
 			
 			ob = (Object *)id;
 			
-			/* link at active layer (view3d->lay if in context, else scene->lay */
+			/* link at active layer (view3d if available in context, else scene one */
 			if ((flag & FILE_ACTIVELAY)) {
 				View3D *v3d = CTX_wm_view3d(C);
-				ob->lay = v3d ? v3d->lay : scene->lay;
+				ob->lay = BKE_screen_view3d_layer_active(v3d, scene);
 			}
 			
 			ob->mode = OB_MODE_OBJECT;