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

Fix for bug #4496

Browse Source 
- Toolbox select menu in faceselect mode was calling object mode
  functions.
This commit is contained in:
Brecht Van Lommel 2006-06-27 11:55:33 +00:00
parent ea993ae989
commit 676d5d7b74
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/include/BSE_headerbuttons.h
View File

@ -140,6 +140,7 @@ void do_view3d_select_object_groupedmenu(void *arg, int event);
void do_view3d_select_object_linkedmenu(void *arg, int event); void do_view3d_select_object_linkedmenu(void *arg, int event);
void do_view3d_select_object_layermenu(void *arg, int event); void do_view3d_select_object_layermenu(void *arg, int event);
void do_view3d_select_object_typemenu(void *arg, int event); void do_view3d_select_object_typemenu(void *arg, int event);
void do_view3d_select_faceselmenu(void *arg, int event);
void do_view3d_select_meshmenu(void *arg, int event); void do_view3d_select_meshmenu(void *arg, int event);
void do_view3d_select_curvemenu(void *arg, int event); void do_view3d_select_curvemenu(void *arg, int event);
void do_view3d_edit_snapmenu(void *arg, int event); void do_view3d_edit_snapmenu(void *arg, int event);

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

@ -1209,10 +1209,8 @@ static uiBlock *view3d_select_pose_armaturemenu(void *arg_unused)
return block; return block;
} }
static void do_view3d_select_faceselmenu(void *arg, int event) void do_view3d_select_faceselmenu(void *arg, int event)
{ {
// extern void borderselect(void);
/* events >= 6 are registered bpython scripts */ /* events >= 6 are registered bpython scripts */
if (event >= 6) BPY_menu_do_python(PYMENU_FACESELECT, event - 6); if (event >= 6) BPY_menu_do_python(PYMENU_FACESELECT, event - 6);

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

@ -845,6 +845,16 @@ static TBitem tb_object_select[]= {
{ 0, "Grouped", 0, tb_object_select_grouped}, { 0, "Grouped", 0, tb_object_select_grouped},
{ -1, "", 0, do_view3d_select_objectmenu}}; { -1, "", 0, do_view3d_select_objectmenu}};
static TBitem tb_face_select[]= {
{ 0, "Border Select|B", 0, NULL},
{ 0, "SEPR", 0, NULL},
{ 0, "Select/Deselect All|A", 2, NULL},
{ 0, "Inverse", 3, NULL},
{ 0, "Same UV", 4, NULL},
{ 0, "SEPR", 0, NULL},
{ 0, "Linked Faces|Ctrl L", 5, NULL},
{ -1, "", 0, do_view3d_select_faceselmenu}};
static TBitem tb_mesh_select[]= { static TBitem tb_mesh_select[]= {
{ 0, "Border Select|B", 0, NULL}, { 0, "Border Select|B", 0, NULL},
{ 0, "SEPR", 0, NULL}, { 0, "SEPR", 0, NULL},
@ -1845,7 +1855,8 @@ void toolbox_n(void)
} }
} }
} }
else { else if (G.f & G_FACESELECT) {
menu3 = tb_face_select;
} }
} }
else if(curarea->spacetype==SPACE_NODE) { else if(curarea->spacetype==SPACE_NODE) {