[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19741] branches/blender2.5/blender/source /blender/editors: 2.5
Ton Roosendaal
ton at blender.org
Wed Apr 15 19:53:12 CEST 2009
Revision: 19741
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19741
Author: ton
Date: 2009-04-15 19:53:12 +0200 (Wed, 15 Apr 2009)
Log Message:
-----------
2.5
- Fun for testers: Added "Redo Operator" Panel in view3d 'nkey' region.
It's going to be part of tools UI I know, but this will give good
tests of what goes on with operators. I had to add small fixes in
Transform for it already. :)
One important issue to note is that it lists every operator, also from
non-3D-window ops. Needs checked or classified somehow.
- Fix: removed bad 2.4x hack from how pulldown menus were defined. Made
widget code cleaner, and will show menus like SHIFT+A correct now.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/include/ED_util.h
branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
branches/blender2.5/blender/source/blender/editors/space_file/file_header.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_header.c
branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
branches/blender2.5/blender/source/blender/editors/space_info/info_header.c
branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
branches/blender2.5/blender/source/blender/editors/space_script/script_header.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
branches/blender2.5/blender/source/blender/editors/space_sound/sound_header.c
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/editors/util/undo.c
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_util.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_util.h 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_util.h 2009-04-15 17:53:12 UTC (rev 19741)
@@ -45,6 +45,7 @@
void ED_undo_push (struct bContext *C, char *str);
void ED_undo_push_op (struct bContext *C, struct wmOperator *op);
void ED_undo_pop (struct bContext *C);
+void ED_undo_redo (struct bContext *C);
void ED_OT_undo (struct wmOperatorType *ot);
void ED_OT_redo (struct wmOperatorType *ot);
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_panel.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -584,11 +584,15 @@
panelname= pa->drawname[0]?pa->drawname:pa->panelname;
if(pa->active && (pa==panel || pa->paneltab==panel)) {
+ float col[3];
+
+ UI_GetThemeColor3fv(TH_TEXT, col);
+
/* active tab */
if(pa==panel)
- UI_ThemeColor(TH_TEXT);
+ glColor4f(col[0], col[1], col[2], 1.0f);
else
- UI_ThemeColorBlend(TH_TEXT, TH_BACK, 0.5f);
+ glColor4f(col[0], col[1], col[2], 0.5f);
hrect= *rect;
hrect.xmin= rect->xmin+pnl_icons + a*width;
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_widgets.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -1531,11 +1531,12 @@
static void widget_disabled(rcti *rect)
{
- float col[3];
+ float col[4];
glEnable(GL_BLEND);
- UI_GetThemeColor3fv(TH_BACK, col);
+ /* can't use theme TH_BACK or TH_PANEL... undefined */
+ glGetFloatv(GL_COLOR_CLEAR_VALUE, col);
glColor4f(col[0], col[1], col[2], 0.5f);
glRectf(rect->xmin, rect->ymin, rect->xmax, rect->ymax);
@@ -1708,12 +1709,6 @@
case SEPR:
break;
- /* XXX in old code UI_EMBOSSP was set to distinguish these types, fix */
- case PULLDOWN:
- case HMENU:
- wt= widget_type(UI_WTYPE_PULLDOWN);
- break;
-
default:
wt= widget_type(UI_WTYPE_MENU_ITEM);
}
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -903,6 +903,8 @@
}
xco+=XIC;
+ uiBlockSetEmboss(block, UI_EMBOSS);
+
return xco;
}
Modified: branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_action/action_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -1606,8 +1606,6 @@
ANIM_animdata_get_context(C, &ac);
if ((sa->flag & HEADER_NO_PULLDOWN)==0) {
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
xmax= GetButStringLength("View");
uiDefPulldownBut(block, action_viewmenu, CTX_wm_area(C),
Modified: branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -143,9 +143,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C),
"View", xco, yco, xmax-3, 20, "");
Modified: branches/blender2.5/blender/source/blender/editors/space_file/file_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_file/file_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_file/file_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -110,8 +110,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C),
"View", xco, yco-2, xmax-3, 24, "");
Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -162,9 +162,6 @@
if ((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
uiDefPulldownBut(block, graph_viewmenu, CTX_wm_area(C),
"View", xco, yco-2, xmax-3, 24, "");
Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -741,8 +741,6 @@
char *menuname;
int xmax;
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
uiDefMenuBut(block, image_viewmenu, NULL, "View", xco, yco, xmax-3, 20, "");
xco+= xmax;
Modified: branches/blender2.5/blender/source/blender/editors/space_info/info_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_info/info_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_info/info_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -400,9 +400,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("File");
uiDefMenuBut(block, info_filemenu, NULL, "File", xco, yco, xmax-3, 20, "");
xco+= xmax;
Modified: branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_nla/nla_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -112,9 +112,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C),
"View", xco, yco-2, xmax-3, 24, "");
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -699,9 +699,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
-
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
xmax= GetButStringLength("View");
uiDefPulldownBut(block, node_viewmenu, NULL,
Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_outliner/outliner_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -220,9 +220,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
uiDefPulldownBut(block, outliner_viewmenu, CTX_wm_area(C),
"View", xco, yco-2, xmax-3, 24, "");
Modified: branches/blender2.5/blender/source/blender/editors/space_script/script_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_script/script_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_script/script_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -112,9 +112,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
uiDefPulldownBut(block, dummy_viewmenu, CTX_wm_area(C),
"View", xco, yco-2, xmax-3, 24, "");
Modified: branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c 2009-04-15 16:23:13 UTC (rev 19740)
+++ branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_header.c 2009-04-15 17:53:12 UTC (rev 19741)
@@ -335,9 +335,6 @@
if((sa->flag & HEADER_NO_PULLDOWN)==0) {
int xmax;
- /* pull down menus */
- uiBlockSetEmboss(block, UI_EMBOSSP);
-
xmax= GetButStringLength("View");
//uiDefMenuBut(block, seq_viewmenu, NULL, "View", xco, 0, xmax-3, 24, ""); // TODO
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list