Revision: 21871
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21871
Author: campbellbarton
Date: 2009-07-25 01:07:18 +0200 (Sat, 25 Jul 2009)
Log Message:
-----------
- report header buttons were not drawing.
- shift+b in the console would do border zoom (rather then upper case B), fixed
by making v2d's border zoom check if the v2d's zoom is locked.
- blender in debug mode registers all operators, useful for testing.
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_console.py
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: branches/blender2.5/blender/release/ui/space_console.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_console.py 2009-07-24
22:33:09 UTC (rev 21870)
+++ branches/blender2.5/blender/release/ui/space_console.py 2009-07-24
23:07:18 UTC (rev 21871)
@@ -18,7 +18,7 @@
row = layout.row()
row.itemR(sc, "console_type", expand=True)
- if sc.type == 'REPORT':
+ if sc.console_type == 'REPORT':
if context.area.show_menus:
row = layout.row()
Modified:
branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2009-07-24 22:33:09 UTC (rev 21870)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d_ops.c
2009-07-24 23:07:18 UTC (rev 21871)
@@ -464,7 +464,7 @@
/* ------------------ 'Shared' stuff ------------------------ */
/* check if step-zoom can be applied */
-static short view_zoomstep_ok(bContext *C)
+static int view_zoom_poll(bContext *C)
{
ARegion *ar= CTX_wm_region(C);
View2D *v2d;
@@ -527,7 +527,7 @@
static int view_zoomin_exec(bContext *C, wmOperator *op)
{
/* check that there's an active region, as View2D data resides there */
- if (!view_zoomstep_ok(C))
+ if (!view_zoom_poll(C))
return OPERATOR_PASS_THROUGH;
/* set RNA-Props - zooming in by uniform factor */
@@ -563,7 +563,7 @@
static int view_zoomout_exec(bContext *C, wmOperator *op)
{
/* check that there's an active region, as View2D data resides there */
- if (!view_zoomstep_ok(C))
+ if (!view_zoom_poll(C))
return OPERATOR_PASS_THROUGH;
/* set RNA-Props - zooming in by uniform factor */
@@ -831,6 +831,8 @@
ot->invoke= view_zoomdrag_invoke;
ot->modal= view_zoomdrag_modal;
+ ot->poll= view_zoom_poll;
+
/* operator is repeatable */
// ot->flag= OPTYPE_REGISTER|OPTYPE_BLOCKING;
@@ -929,7 +931,7 @@
ot->exec= view_borderzoom_exec;
ot->modal= WM_border_select_modal;
- ot->poll= ED_operator_areaactive;
+ ot->poll= view_zoom_poll;
/* rna */
RNA_def_int(ot->srna, "event_type", 0, INT_MIN, INT_MAX, "Event Type",
"", INT_MIN, INT_MAX);
Modified:
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
2009-07-24 22:33:09 UTC (rev 21870)
+++
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
2009-07-24 23:07:18 UTC (rev 21871)
@@ -277,6 +277,8 @@
#ifndef DISABLE_PYTHON
WM_keymap_add_item(keymap, "CONSOLE_OT_exec", RETKEY, KM_PRESS, 0, 0);
/* python operator - space_text.py */
+ WM_keymap_add_item(keymap, "CONSOLE_OT_exec", PADENTER, KM_PRESS, 0, 0);
+
//WM_keymap_add_item(keymap, "CONSOLE_OT_autocomplete", TABKEY,
KM_PRESS, 0, 0); /* python operator - space_text.py */
WM_keymap_add_item(keymap, "CONSOLE_OT_autocomplete", RETKEY, KM_PRESS,
KM_CTRL, 0); /* python operator - space_text.py */
#endif
@@ -291,13 +293,8 @@
WM_keymap_add_item(keymap, "CONSOLE_OT_report_delete", DELKEY,
KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "CONSOLE_OT_report_copy", CKEY, KM_PRESS,
KM_CTRL, 0);
-
-
-
-
-
RNA_string_set(WM_keymap_add_item(keymap, "CONSOLE_OT_insert", TABKEY,
KM_PRESS, 0, 0)->ptr, "text", " "); /* fake tabs */
- WM_keymap_add_item(keymap, "CONSOLE_OT_insert", KM_TEXTINPUT, KM_PRESS,
KM_ANY, 0); // last!
+ WM_keymap_add_item(keymap, "CONSOLE_OT_insert", KM_TEXTINPUT, KM_ANY,
KM_ANY, 0); // last!
}
/****************** header region ******************/
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
2009-07-24 22:33:09 UTC (rev 21870)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
2009-07-24 23:07:18 UTC (rev 21871)
@@ -1149,7 +1149,7 @@
}
/* ********************* Border Zoom operator ****************** */
-static int view3d_border_zoom_exec(bContext *C, wmOperator *op)
+static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
{
ARegion *ar= CTX_wm_region(C);
View3D *v3d = CTX_wm_view3d(C);
@@ -1285,7 +1285,7 @@
return OPERATOR_FINISHED;
}
-static int view3d_border_zoom_invoke(bContext *C, wmOperator *op, wmEvent
*event)
+static int view3d_zoom_border_invoke(bContext *C, wmOperator *op, wmEvent
*event)
{
RegionView3D *rv3d= CTX_wm_region_view3d(C);
@@ -1305,8 +1305,8 @@
ot->idname= "VIEW3D_OT_zoom_border";
/* api callbacks */
- ot->invoke= view3d_border_zoom_invoke;
- ot->exec= view3d_border_zoom_exec;
+ ot->invoke= view3d_zoom_border_invoke;
+ ot->exec= view3d_zoom_border_exec;
ot->modal= WM_border_select_modal;
ot->poll= ED_operator_view3d_active;
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-07-24 22:33:09 UTC (rev 21870)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c
2009-07-24 23:07:18 UTC (rev 21871)
@@ -267,7 +267,7 @@
ED_undo_push_op(C, op);
if(repeat==0) {
- if(op->type->flag & OPTYPE_REGISTER)
+ if((op->type->flag & OPTYPE_REGISTER) || (G.f &
G_DEBUG))
wm_operator_register(C, op);
else
WM_operator_free(op);
@@ -373,7 +373,7 @@
if(ot->flag & OPTYPE_UNDO)
ED_undo_push_op(C, op);
- if(ot->flag & OPTYPE_REGISTER)
+ if((ot->flag & OPTYPE_REGISTER) || (G.f & G_DEBUG))
wm_operator_register(C, op);
else
WM_operator_free(op);
@@ -717,7 +717,7 @@
if(ot->flag & OPTYPE_UNDO)
ED_undo_push_op(C, op);
- if(ot->flag & OPTYPE_REGISTER)
+ if((ot->flag & OPTYPE_REGISTER) || (G.f &
G_DEBUG))
wm_operator_register(C, op);
else
WM_operator_free(op);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
