diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
| commit | 4e8e502c0267faa68ce686df51cfb061d73ae93e (patch) | |
| tree | bf68517c1b537247b52b34d206cc640dc7280b31 /source/blender/editors/object/object_relations.c | |
| parent | f5cff8ad37edbb46f155e768a07ff6785938f1b9 (diff) | |
| parent | de0db6c8daaf4f6276b43bd4c78d623fdb0eafb9 (diff) | |
Merging trunk up to r38932.
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index ab9c69988fe..ce1f47c1b7b 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1097,7 +1097,7 @@ static int move_to_layer_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); View3D *v3d= CTX_wm_view3d(C); unsigned int lay, local; - int islamp= 0; + /* int islamp= 0; */ /* UNUSED */ lay= move_to_layer_init(C, op); lay &= 0xFFFFFF; @@ -1113,7 +1113,7 @@ static int move_to_layer_exec(bContext *C, wmOperator *op) base->object->lay= lay; base->object->flag &= ~SELECT; base->flag &= ~SELECT; - if(base->object->type==OB_LAMP) islamp= 1; + /* if(base->object->type==OB_LAMP) islamp= 1; */ } CTX_DATA_END; } @@ -1125,7 +1125,7 @@ static int move_to_layer_exec(bContext *C, wmOperator *op) local= base->lay & 0xFF000000; base->lay= lay + local; base->object->lay= lay; - if(base->object->type==OB_LAMP) islamp= 1; + /* if(base->object->type==OB_LAMP) islamp= 1; */ } CTX_DATA_END; } |