[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18800] branches/blender2.5/blender/source /blender: 2.5
Ton Roosendaal
ton at blender.org
Tue Feb 3 11:41:48 CET 2009
Revision: 18800
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18800
Author: ton
Date: 2009-02-03 11:41:48 +0100 (Tue, 03 Feb 2009)
Log Message:
-----------
2.5
- removed undefined operators from view3d menu, the error prints
("undefined operator") is currently a real error; later on when
operators are more dynamically defined it can be feature.
- made uiMenuContext() work locally, only on the items as defined
after this call.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/windowmanager/WM_types.h
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c 2009-02-03 10:14:29 UTC (rev 18799)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c 2009-02-03 10:41:48 UTC (rev 18800)
@@ -1819,7 +1819,7 @@
y1 -= MENU_BUTTON_HEIGHT;
}
else if(item->type==MENU_ITEM_OPNAME_BOOL) {
- but= uiDefIconTextButO(block, BUTM, item->opname, head->opcontext, item->icon, item->name, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");
+ but= uiDefIconTextButO(block, BUTM, item->opname, item->opcontext, item->icon, item->name, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");
RNA_boolean_set(uiButGetOperatorPtrRNA(but), item->propname, item->boolval);
y1 -= MENU_BUTTON_HEIGHT;
@@ -1831,19 +1831,19 @@
name= ui_menu_enumpropname(item->opname, item->propname, item->enumval);
BLI_strncpy(bname, name, sizeof(bname));
- but= uiDefIconTextButO(block, BUTM, item->opname, head->opcontext, item->icon, bname, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");
+ but= uiDefIconTextButO(block, BUTM, item->opname, item->opcontext, item->icon, bname, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");
RNA_enum_set(uiButGetOperatorPtrRNA(but), item->propname, item->enumval);
y1 -= MENU_BUTTON_HEIGHT;
}
else if(item->type==MENU_ITEM_OPNAME_FLOAT) {
- but= uiDefIconTextButO(block, BUTM, item->opname, head->opcontext, item->icon, item->name, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");
+ but= uiDefIconTextButO(block, BUTM, item->opname, item->opcontext, item->icon, item->name, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, "");
RNA_float_set(uiButGetOperatorPtrRNA(but), item->propname, item->fltval);
y1 -= MENU_BUTTON_HEIGHT;
}
else if(item->type==MENU_ITEM_OPNAME) {
- uiDefIconTextButO(block, BUTM, item->opname, head->opcontext, item->icon, NULL, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, NULL);
+ uiDefIconTextButO(block, BUTM, item->opname, item->opcontext, item->icon, NULL, x1, y1, width+16, MENU_BUTTON_HEIGHT-1, NULL);
y1 -= MENU_BUTTON_HEIGHT;
}
else if(item->type==MENU_ITEM_RNA_BOOL) {
@@ -1954,8 +1954,9 @@
else
item->icon= ICON_BLANK1;
item->retval= argval;
- item->opcontext= WM_OP_EXEC_REGION_WIN;
+ item->opcontext= head->opcontext;
+
BLI_addtail(&head->items, item);
return item;
Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 2009-02-03 10:14:29 UTC (rev 18799)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c 2009-02-03 10:41:48 UTC (rev 18800)
@@ -116,9 +116,6 @@
/* XXX port over */
static void handle_view3d_lock(void) {}
static void allqueue(int x, int y) {}
-static void persptoetsen(int x) {}
-static void fly(void) {}
-static void editmesh_align_view_to_selected(void *x, int y) {}
static void countall(void) {}
extern void borderselect();
static int retopo_mesh_paint_check() {return 0;}
@@ -248,6 +245,7 @@
allqueue(REDRAWNLA, 0);
}
+#if 0
static void do_view3d_view_camerasmenu(bContext *C, void *arg, int event)
{
Scene *scene= CTX_data_scene(C);
@@ -278,7 +276,7 @@
allqueue(REDRAWVIEW3D, 0);
}
-#if 0
+
static uiBlock *view3d_view_camerasmenu(bContext *C, ARegion *ar, void *arg_unused)
{
Scene *scene= CTX_data_scene(C);
@@ -311,6 +309,8 @@
return block;
}
#endif
+
+#if 0
static void do_view3d_view_cameracontrolsmenu(bContext *C, void *arg, int event)
{
switch(event) {
@@ -366,6 +366,7 @@
allqueue(REDRAWVIEW3D, 0);
}
+
static uiBlock *view3d_view_cameracontrolsmenu(bContext *C, ARegion *ar, void *arg_unused)
{
/* static short tog=0; */
@@ -456,7 +457,7 @@
}
allqueue(REDRAWVIEW3D, 0);
}
-#if 0
+
static uiBlock *view3d_view_alignviewmenu(bContext *C, ARegion *ar, void *arg_unused)
{
/* static short tog=0; */
@@ -483,19 +484,16 @@
uiTextBoundsBlock(block, 50);
return block;
}
-
-#ifndef DISABLE_PYTHON
-// XXX static void do_view3d_view_spacehandlers(bContext *C, void *arg, int event)
-//{
-//}
#endif
+
+#if 0
static uiBlock *view3d_view_spacehandlers(bContext *C, ARegion *ar, void *arg_unused)
{
/* XXX */
return NULL;
}
-#endif /* DISABLE_PYTHON */
+
static void do_view3d_viewmenu(bContext *C, void *arg, int event)
{
@@ -553,12 +551,13 @@
}
allqueue(REDRAWVIEW3D, 1);
}
+#endif
static void view3d_view_viewnavmenu(bContext *C, uiMenuItem *head, void *arg_unused)
{
- uiMenuItemO(head, "VIEW3D_OT_view_fly_mode", ICON_BLANK1);
+// uiMenuItemO(head, "VIEW3D_OT_view_fly_mode", ICON_BLANK1);
- uiMenuSeparator(head);
+// uiMenuSeparator(head);
uiMenuItemEnumO(head, "VIEW3D_OT_view_orbit", "type", V3D_VIEW_STEPLEFT);
uiMenuItemEnumO(head, "VIEW3D_OT_view_orbit", "type", V3D_VIEW_STEPRIGHT);
@@ -590,13 +589,13 @@
{
ScrArea *sa= CTX_wm_area(C);
- uiMenuItemO(head, "VIEW3D_OT_toggle_transform_orientations_panel", ICON_MENU_PANEL); // Transform Orientations...
- uiMenuItemO(head, "VIEW3D_OT_toggle_render_preview_panel", ICON_MENU_PANEL); // render preview...
- uiMenuItemO(head, "VIEW3D_OT_toggle_view_properties_panel", ICON_MENU_PANEL); // View Properties....
- uiMenuItemO(head, "VIEW3D_OT_toggle_background_image_panel", ICON_MENU_PANEL); // Background Image....
- uiMenuItemO(head, "VIEW3D_OT_toggle_grease_pencil_panel", ICON_MENU_PANEL); // Grease Pencil....
+// uiMenuItemO(head, "VIEW3D_OT_toggle_transform_orientations_panel", ICON_MENU_PANEL); // Transform Orientations...
+// uiMenuItemO(head, "VIEW3D_OT_toggle_render_preview_panel", ICON_MENU_PANEL); // render preview...
+// uiMenuItemO(head, "VIEW3D_OT_toggle_view_properties_panel", ICON_MENU_PANEL); // View Properties....
+// uiMenuItemO(head, "VIEW3D_OT_toggle_background_image_panel", ICON_MENU_PANEL); // Background Image....
+// uiMenuItemO(head, "VIEW3D_OT_toggle_grease_pencil_panel", ICON_MENU_PANEL); // Grease Pencil....
- uiMenuSeparator(head);
+// uiMenuSeparator(head);
uiMenuItemEnumO(head, "VIEW3D_OT_viewnumpad", "view", V3D_VIEW_CAMERA);
uiMenuItemEnumO(head, "VIEW3D_OT_viewnumpad", "view", V3D_VIEW_TOP);
@@ -611,14 +610,14 @@
uiMenuSeparator(head);
- uiMenuItemO(head, "VIEW3D_OT_view_show_all_layers", ICON_BLANK1);
+// uiMenuItemO(head, "VIEW3D_OT_view_show_all_layers", ICON_BLANK1);
- uiMenuSeparator(head);
+// uiMenuSeparator(head);
- uiMenuItemO(head, "VIEW3D_OT_view_local_view", ICON_BLANK1);
- uiMenuItemO(head, "VIEW3D_OT_view_global_view", ICON_BLANK1);
+// uiMenuItemO(head, "VIEW3D_OT_view_local_view", ICON_BLANK1);
+// uiMenuItemO(head, "VIEW3D_OT_view_global_view", ICON_BLANK1);
- uiMenuSeparator(head);
+// uiMenuSeparator(head);
uiMenuLevel(head, "View Navigation", view3d_view_viewnavmenu);
uiMenuLevel(head, "Align View", view3d_view_alignviewmenu);
Modified: branches/blender2.5/blender/source/blender/windowmanager/WM_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/WM_types.h 2009-02-03 10:14:29 UTC (rev 18799)
+++ branches/blender2.5/blender/source/blender/windowmanager/WM_types.h 2009-02-03 10:41:48 UTC (rev 18800)
@@ -45,10 +45,12 @@
/* context to call operator in for WM_operator_name_call */
enum {
+ /* if there's invoke, call it, otherwise exec */
WM_OP_INVOKE_DEFAULT,
WM_OP_INVOKE_REGION_WIN,
WM_OP_INVOKE_AREA,
WM_OP_INVOKE_SCREEN,
+ /* only call exec */
WM_OP_EXEC_DEFAULT,
WM_OP_EXEC_REGION_WIN,
WM_OP_EXEC_AREA,
More information about the Bf-blender-cvs
mailing list