[Bf-blender-cvs] [e78d9946b80] filebrowser_redesign: Merge branch 'master' into filebrowser_redesign

Julian Eisel noreply at git.blender.org
Fri May 3 23:49:25 CEST 2019


Commit: e78d9946b809039bd2a2c270c3c5c4b7ef1e83a1
Author: Julian Eisel
Date:   Thu May 2 21:33:44 2019 +0200
Branches: filebrowser_redesign
https://developer.blender.org/rBe78d9946b809039bd2a2c270c3c5c4b7ef1e83a1

Merge branch 'master' into filebrowser_redesign

===================================================================



===================================================================

diff --cc source/blender/editors/space_file/space_file.c
index 256c7fa787d,9fb07042104..a34ba4a823f
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@@ -554,14 -544,13 +553,14 @@@ static void file_ui_region_init(wmWindo
  
    /* own keymap */
    keymap = WM_keymap_ensure(wm->defaultconf, "File Browser", SPACE_FILE, 0);
-   WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+   WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap);
  
    keymap = WM_keymap_ensure(wm->defaultconf, "File Browser Buttons", SPACE_FILE, 0);
-   WM_event_add_keymap_handler_bb(&ar->handlers, keymap, &ar->v2d.mask, &ar->winrct);
+   WM_event_add_keymap_handler_v2d_mask(&ar->handlers, keymap);
  }
  
 -static void file_ui_region_draw(const bContext *C, ARegion *ar)
 +#if 0
 +static void file_ui_region_draw_ex(const bContext *C, ARegion *ar, bool is_execution_buts)
  {
    float col[3];
    /* clear */



More information about the Bf-blender-cvs mailing list