diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-24 16:13:13 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-24 16:13:13 +0400 |
| commit | 385c72f5f26ae9c86bf40c127c44216ceea0e6c1 (patch) | |
| tree | 6c0432578abee5437adc94e96b5a91c593b866b4 /source/blender/editors/space_text/space_text.c | |
| parent | 5841d1c8145ba50addeb17fa0231705d949d8b3d (diff) | |
| parent | b5ce1b1a23a3befbcc4cd3c67a5ec6a76d77aa5a (diff) | |
Merged changes in the trunk up to revision 55546.
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript
Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
Diffstat (limited to 'source/blender/editors/space_text/space_text.c')
| -rw-r--r-- | source/blender/editors/space_text/space_text.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 110e0ab5bc4..58e45bc766f 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -504,10 +504,13 @@ static void text_properties_area_init(wmWindowManager *wm, ARegion *ar) { wmKeyMap *keymap; + ar->v2d.scroll = V2D_SCROLL_RIGHT | V2D_SCROLL_VERTICAL_HIDE; + ED_region_panels_init(wm, ar); + + /* own keymaps */ keymap = WM_keymap_find(wm->defaultconf, "Text Generic", SPACE_TEXT, 0); WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct); - ED_region_panels_init(wm, ar); } static void text_properties_area_draw(const bContext *C, ARegion *ar) |