archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Added to select group-

Browse Source 
Siblings, ad Type
This removes the need for the "Select Type" menu (please review Broken)
This commit is contained in:
Campbell Barton
2006-04-02 15:40:56 +00:00
parent 8f38a91602
commit 0e01b351fe
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/src/header_view3d.c
View File

@@ -743,8 +743,10 @@ void do_view3d_select_object_groupedmenu(void *arg, int event)
case 1: /* Children */ case 1: /* Children */
case 2: /* Immediate Children */ case 2: /* Immediate Children */
case 3: /* Parent */ case 3: /* Parent */
case 4: /* Objects on Shared Layers */ case 4: /* Siblings */
case 5: /* Objects in Same Group */ case 5: /* Type */
case 6: /* Objects on Shared Layers */
case 7: /* Objects in Same Group */
select_object_grouped((short)event); select_object_grouped((short)event);
break; break;
} }
@@ -762,8 +764,10 @@ static uiBlock *view3d_select_object_groupedmenu(void *arg_unused)
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Children|Shift G, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Children|Shift G, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Immediate Children|Shift G, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Immediate Children|Shift G, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Parent|Shift G, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Parent|Shift G, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Objects on Shared Layers|Shift G, 4", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Siblings (Shared Parent)|Shift G, 4", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Objects in Same Group|Shift G, 5", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Objects of Same Type|Shift G, 5", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Objects on Shared Layers|Shift G, 6", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 5, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Objects in Same Group|Shift G, 7", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
uiBlockSetDirection(block, UI_RIGHT); uiBlockSetDirection(block, UI_RIGHT);
uiTextBoundsBlock(block, 60); uiTextBoundsBlock(block, 60);

46
source/blender/src/space.c
View File

@@ -614,11 +614,38 @@ static void select_same_group(Object *ob) /* Select objects in the same group as
} }
} }
static void select_same_parent(Object *ob) /* Select objects woth the same parent as the active (siblings), parent can be NULL also */
{
Base *base;
if (!ob)
return;
for (base= FIRSTBASE; base; base= base->next)
if (base->object->parent==ob->parent) {
base->flag |= SELECT;
base->object->flag |= SELECT;
}
}
static void select_same_type(Object *ob) /* Select objects woth the same parent as the active (siblings), parent can be NULL also */
{
Base *base;
if (!ob)
return;
for (base= FIRSTBASE; base; base= base->next)
if (base->object->type==ob->type) {
base->flag |= SELECT;
base->object->flag |= SELECT;
}
}
void select_object_grouped(short nr) void select_object_grouped(short nr)
{ {
Base *base; Base *base;
if(nr==4) { if(nr==6) {
base= FIRSTBASE; base= FIRSTBASE;
while(base) { while(base) {
if (base->lay & OBACT->lay) { if (base->lay & OBACT->lay) {
@@ -628,10 +655,15 @@ void select_object_grouped(short nr)
base= base->next; base= base->next;
} }
} }
else if(nr==5) select_same_group(OBACT);
else if(nr==2) select_children(OBACT, 0);
else if(nr==1) select_children(OBACT, 1); else if(nr==1) select_children(OBACT, 1);
else if(nr==2) select_children(OBACT, 0);
else if(nr==3) select_parent(); else if(nr==3) select_parent();
else if(nr==4) select_same_parent(OBACT);
else if(nr==5) select_same_type(OBACT);
else if(nr==7) select_same_group(OBACT);
countall(); countall();
allqueue(REDRAWVIEW3D, 0); allqueue(REDRAWVIEW3D, 0);
@@ -647,11 +679,13 @@ static void select_object_grouped_menu(void)
/* make menu string */ /* make menu string */
str= MEM_mallocN(160, "groupmenu"); str= MEM_mallocN(180, "groupmenu");
strcpy(str, "Select Grouped%t|Children%x1|" strcpy(str, "Select Grouped%t|Children%x1|"
"Immediate Children%x2|Parent%x3|" "Immediate Children%x2|Parent%x3|"
"Objects on Shared Layers%x4|" "Siblings (Shared Parent)%x4|"
"Objects in Same Group%x5|"); "Objects of Same Type%x5|"
"Objects on Shared Layers%x6|"
"Objects in Same Group%x7|");
/* here we go */ /* here we go */