kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

* Put the Add->Group menu in the top info header too.

Browse Source
This commit is contained in:
Matt Ebb 2006-01-26 21:18:02 +00:00
parent fa54435615
commit 517048eb3d
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/blender/src/header_info.c
View File

@ -43,6 +43,7 @@
#include <config.h>
#endif
#include "DNA_group_types.h"
#include "DNA_ID.h"
#include "DNA_image_types.h"
#include "DNA_lamp_types.h"
@ -77,6 +78,7 @@
#include "BIF_drawscene.h"
#include "BKE_blender.h"
#include "BKE_depsgraph.h"
#include "BKE_exotic.h"
#include "BKE_global.h"
#include "BKE_image.h"
@ -1181,6 +1183,44 @@ static uiBlock *info_add_lampmenu(void *arg_unused)
return block;
}
static void do_info_add_groupmenu(void *arg, int event)
{
Object *ob;
add_object_draw(OB_EMPTY);
ob= OBACT;
ob->dup_group= BLI_findlink(&G.main->group, event);
if(ob->dup_group) {
id_us_plus((ID *)ob->dup_group);
ob->transflag |= OB_DUPLIGROUP;
DAG_scene_sort(G.scene);
}
}
static uiBlock *info_add_groupmenu(void *arg_unused)
{
uiBlock *block;
short yco= 0;
Group *group;
int a;
int tot= BLI_countlist(&G.main->group);
block= uiNewBlock(&curarea->uiblocks, "add_groupmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
uiBlockSetButmFunc(block, do_info_add_groupmenu, NULL);
for(a=0, group= G.main->group.first; group; group= group->id.next, a++) {
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, group->id.name+2, 0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, a, "");
}
uiBlockSetDirection(block, UI_RIGHT);
uiTextBoundsBlock(block, 50);
return block;
}
void do_info_addmenu(void *arg, int event)
{
switch(event) {
@ -1244,6 +1284,10 @@ static uiBlock *info_addmenu(void *arg_unused)
uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBlockBut(block, info_add_groupmenu, NULL, ICON_RIGHTARROW_THIN, "Group", 0, yco-=20, 120, 19, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Camera", 0, yco-=20, 120, 19, NULL, 0.0, 0.0, 1, 6, "");
uiDefIconTextBlockBut(block, info_add_lampmenu, NULL, ICON_RIGHTARROW_THIN, "Lamp", 0, yco-=20, 120, 19, "");

5
source/blender/src/toolbox.c
View File

@ -2243,8 +2243,8 @@ static TBitem addmenu_armature[]= {
{ -1, "", 0, do_info_addmenu}};
/* dynamic items */
#define TB_ADD_GROUP 6
#define TB_ADD_LAMP 9
#define TB_ADD_GROUP 7
#define TB_ADD_LAMP 10
static TBitem tb_add[]= {
{ 0, "Mesh", 0, addmenu_mesh},
@ -2253,6 +2253,7 @@ static TBitem tb_add[]= {
{ 0, "Meta", 3, addmenu_meta},
{ 0, "Text", 4, NULL},
{ 0, "Empty", 5, NULL},
{ 0, "SEPR", 0, NULL},
{ 0, "Group", 10, NULL},
{ 0, "SEPR", 0, NULL},
{ 0, "Camera", 6, NULL},