diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 14:14:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-13 14:14:48 +0400 |
| commit | e06d82227c2d6fc58f3e3d28852f251c1de68997 (patch) | |
| tree | 1efede1045efe8dc17eeff200fcf2b36e11736d2 /source/blender/editors/object/object_add.c | |
| parent | 0527c4923d23cc205e9e74de2d53853ca96cc08c (diff) | |
adding metaballs and lamps in local mode was broken.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 196362d9fcd..c53549728f6 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -226,20 +226,18 @@ static void object_add_generic_invoke_options(bContext *C, wmOperator *op) View3D *v3d = CTX_wm_view3d(C); Scene *scene = CTX_data_scene(C); int a, values[20], layer; - + if(v3d) { layer = (v3d->scenelock && !v3d->localvd)? scene->layact: v3d->layact; - - for(a=0; a<20; a++) - values[a]= (layer & (1<<a)); } else { layer = scene->layact; + } - for(a=0; a<20; a++) - values[a]= (layer & (1<<a)); + for (a=0; a<20; a++) { + values[a]= (layer & (1<<a)); } - + RNA_boolean_set_array(op->ptr, "layers", values); } } |