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
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-06-04 05:39:34 +0400
committerMatt Ebb <matt@mke3.net>2010-06-04 05:39:34 +0400
commitb0eee216d4e551fc3c344d73983928e97bd59bb0 (patch)
tree4cc77c32666393d42f5df392a72ccdbc8257c13b /source/blender/editors/object/object_add.c
parentab5367e09f9cfc332a171099385e2c1b6d7516da (diff)
Fix [#22383] 3dView Layer Management (by Mouse) broken
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r--source/blender/editors/object/object_add.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 9b0a5c9ff33..393fb70c177 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -212,12 +212,13 @@ static void object_add_generic_invoke_options(bContext *C, wmOperator *op)
for(a=0; a<32; a++)
values[a]= (layer & (1<<a));
} else {
- layer = v3d->layact;
+ layer = (v3d->scenelock)?scene->layact:v3d->layact;
+
for(a=0; a<32; a++)
values[a]= (layer & (1<<a));
}
} else {
- layer = scene->lay;
+ layer = scene->layact;
for(a=0; a<32; a++)
values[a]= (layer & (1<<a));
}