Revision: 21990
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21990
Author: blendix
Date: 2009-07-28 20:59:36 +0200 (Tue, 28 Jul 2009)
Log Message:
-----------
2.5: various one-liner fixes
* Image window only show game properties in game mode.
* Fix image window render info drawing wrong with alpha enabled.
* Win32 editmode cursor now uses a different one than the system
cursor, that one is barely visible, especially in the new theme
colors.
* Center text in operator header print.
* Fix sequencer unlock shortcut key.
* Fix uv layer / vertex color active render button now graying out.
* Workaround to get default zoom level 1:1 again for new buttons
(will try to fix properly later, is due to scrollbars).
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/space_image.py
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
Modified: branches/blender2.5/blender/release/ui/space_image.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_image.py 2009-07-28
18:54:02 UTC (rev 21989)
+++ branches/blender2.5/blender/release/ui/space_image.py 2009-07-28
18:59:36 UTC (rev 21990)
@@ -275,8 +275,9 @@
__label__ = "Game Properties"
def poll(self, context):
+ rd = context.scene.render_data
sima = context.space_data
- return (sima and sima.image)
+ return (sima and sima.image) and (rd.engine == 'BLENDER_GAME')
def draw(self, context):
sima = context.space_data
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-07-28 18:54:02 UTC (rev 21989)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_templates.c
2009-07-28 18:59:36 UTC (rev 21990)
@@ -1558,7 +1558,7 @@
/* XXX hardcoded */
if(itemptr.type ==
&RNA_MeshTextureFaceLayer || itemptr.type == &RNA_MeshColorLayer) {
uiBlockSetEmboss(block,
UI_EMBOSSN);
- uiItemR(subrow, "", ICON_SCENE,
&itemptr, "active_render", 0, 0, 0);
+ uiDefIconButR(block, TOG, 0,
ICON_SCENE, 0, 0, UI_UNIT_X, UI_UNIT_Y, &itemptr, "active_render", 0, 0, 0, 0,
0, NULL);
uiBlockSetEmboss(block,
UI_EMBOSS);
}
Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2009-07-28 18:54:02 UTC (rev 21989)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2009-07-28 18:59:36 UTC (rev 21990)
@@ -273,10 +273,12 @@
v2d->tot.ymin= -winy;
v2d->cur.xmin= 0.0f;
- v2d->cur.xmax= winx*panelzoom;
+ /* bad workaround for keeping zoom level with
scrollers */
+ v2d->cur.xmax= (winx -
V2D_SCROLL_WIDTH)*panelzoom;
v2d->cur.ymax= 0.0f;
- v2d->cur.ymin= -winy*panelzoom;
+ /* bad workaround for keeping zoom level with
scrollers */
+ v2d->cur.ymin= (-winy +
V2D_SCROLL_HEIGHT)*panelzoom;
}
break;
Modified: branches/blender2.5/blender/source/blender/editors/screen/area.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/area.c
2009-07-28 18:54:02 UTC (rev 21989)
+++ branches/blender2.5/blender/source/blender/editors/screen/area.c
2009-07-28 18:59:36 UTC (rev 21990)
@@ -330,7 +330,7 @@
glClear(GL_COLOR_BUFFER_BIT);
UI_ThemeColor(TH_TEXT);
- BLF_draw_default(20, 6, 0.0f, ar->headerstr);
+ BLF_draw_default(20, 8, 0.0f, ar->headerstr);
}
else if(at->draw) {
at->draw(C, ar);
Modified:
branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
2009-07-28 18:54:02 UTC (rev 21989)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c
2009-07-28 18:59:36 UTC (rev 21990)
@@ -151,6 +151,7 @@
/* clear header rect */
UI_GetThemeColor3fv(TH_BACK, colf);
glEnable(GL_BLEND);
+ glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glColor4f(colf[0]+0.1f, colf[1]+0.1f, colf[2]+0.1f, 0.5f);
glRecti(rect.xmin, rect.ymin, rect.xmax, rect.ymax+1);
glDisable(GL_BLEND);
Modified:
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
2009-07-28 18:54:02 UTC (rev 21989)
+++
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_ops.c
2009-07-28 18:59:36 UTC (rev 21990)
@@ -123,7 +123,7 @@
RNA_boolean_set(WM_keymap_add_item(keymap, "SEQUENCER_OT_unmute", HKEY,
KM_PRESS, KM_ALT|KM_SHIFT, 0)->ptr, "unselected", 1);
WM_keymap_add_item(keymap, "SEQUENCER_OT_lock", LKEY, KM_PRESS,
KM_SHIFT, 0);
- WM_keymap_add_item(keymap, "SEQUENCER_OT_unlock", HKEY, KM_PRESS,
KM_SHIFT|KM_ALT, 0);
+ WM_keymap_add_item(keymap, "SEQUENCER_OT_unlock", LKEY, KM_PRESS,
KM_SHIFT|KM_ALT, 0);
WM_keymap_add_item(keymap, "SEQUENCER_OT_reload", RKEY, KM_PRESS,
KM_ALT, 0);
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
2009-07-28 18:54:02 UTC (rev 21989)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
2009-07-28 18:59:36 UTC (rev 21990)
@@ -104,6 +104,13 @@
return;
}
+#ifdef _WIN32
+ /* the default win32 cross cursor is barely visible,
+ * only 1 pixel thick, use another one instead */
+ if(curs==CURSOR_EDIT)
+ curs= BC_CROSSCURSOR;
+#endif
+
GHOST_SetCursorVisibility(win->ghostwin, 1);
win->cursor= curs;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
