Cam's patch to enable parenting in the OOPS menu.
authorKent Mein <mein@cs.umn.edu>
Thu, 3 Jun 2004 14:26:44 +0000 (14:26 +0000)
committerKent Mein <mein@cs.umn.edu>
Thu, 3 Jun 2004 14:26:44 +0000 (14:26 +0000)
Kent

source/blender/src/editoops.c
source/blender/src/space.c

index 787167ca038de4d6169496889c3b9b6a7c8229e8..30a01e676d9e656fb732fcf781a06b9f26fd363f 100644 (file)
@@ -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;
        }
index 896f9d8c81c269e62558333cd205b63ccce31371..458dabc1cdac7d82ea2b4379496e4609a7317930 100644 (file)
@@ -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;