diff options
| -rw-r--r-- | release/ui/space_image.py | 3 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_draw.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_ops.c | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 7 |
7 files changed, 17 insertions, 6 deletions
diff --git a/release/ui/space_image.py b/release/ui/space_image.py index f8950892957..eeac19c04e0 100644 --- a/release/ui/space_image.py +++ b/release/ui/space_image.py @@ -275,8 +275,9 @@ class IMAGE_PT_game_properties(bpy.types.Panel): __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 diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 8b01c341565..4383ba8858b 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1558,7 +1558,7 @@ ListBase uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, char *pr /* 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); } diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 0f7532383c9..c76110ac440 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -273,10 +273,12 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) 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; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 62f6e87f073..c74a5ca9c87 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -330,7 +330,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar) 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); diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 7050c7f6d7c..ff25a2635d2 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -151,6 +151,7 @@ static void draw_render_info(Image *ima, ARegion *ar) /* 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); diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index f561fb2ac43..74f22b86b75 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -123,7 +123,7 @@ void sequencer_keymap(wmWindowManager *wm) 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); diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 79830aca12f..56a8d76d8bf 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -104,6 +104,13 @@ void WM_cursor_set(wmWindow *win, int curs) 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; |