diff options
| author | Kent Mein <mein@cs.umn.edu> | 2004-06-03 18:26:44 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2004-06-03 18:26:44 +0400 |
| commit | 94042b0fef154aeac5571134099163776054c4e4 (patch) | |
| tree | 2c2c3960363529195f79dce11b23cc8aba69ebdb /source | |
| parent | bc329a57f94d2c1aad9f6fe29ab83f6f0e93e040 (diff) | |
Cam's patch to enable parenting in the OOPS menu.
Kent
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/editoops.c | 1 | ||||
| -rw-r--r-- | source/blender/src/space.c | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/src/editoops.c b/source/blender/src/editoops.c index 787167ca038..30a01e676d9 100644 --- a/source/blender/src/editoops.c +++ b/source/blender/src/editoops.c @@ -111,6 +111,7 @@ static void oops_to_select_objects(void) while(base) { if(base->flag != base->object->flag) { base->flag= base->object->flag; + set_active_base(base); } base= base->next; } diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 896f9d8c81c..458dabc1cda 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3560,6 +3560,14 @@ void winqreadoopsspace(ScrArea *sa, void *spacedata, BWinEvent *evt) transform_oops('s'); } break; + case PKEY: + if((G.qual==LR_CTRLKEY)) { + make_parent(); + } else if((G.qual==LR_ALTKEY)) { + clear_parent(); + } + break; + case ONEKEY: do_layer_buttons(0); break; |