Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2014-09-29 15:59:02 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-10-03 17:09:28 +0400
commitf0dd7f133673075f4a5c5d1cece4a962b04f0d42 (patch)
tree8233aa8ffafa2cbb77d4667dc6267db23945f886 /source
parent1620fa92478f67139b89f8c1e926a6223eaebe1f (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenloader/intern/readfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4739718fa54..3833846496d 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;