[Bf-blender-cvs] [b4efe25] master: Fix T41905: Linked objects/groups assigned to 'wrong' active layers when called from 3DView

[Bastien Montagne]

Commit: b4efe251196b2bfa7334878bace6049b7700a81d
Author: Bastien Montagne
Date:   Mon Sep 29 13:59:02 2014 +0200
Branches: master
https://developer.blender.org/rBb4efe251196b2bfa7334878bace6049b7700a81d

Fix T41905: Linked objects/groups assigned to 'wrong' active layers when called from 3DView

Typo using v3d->layact instead of v3d->lay when linking and v3d is available in context.

This can be backported to 2.72.

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

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

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

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