diff options
author | Ton Roosendaal <ton@blender.org> | 2013-01-04 18:51:02 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2013-01-04 18:51:02 +0400 |
commit | 4fa340c71691c68148ca72379f21f000f0f35664 (patch) | |
tree | db71c74af0a88f04571161bd6bd00c340f62f5ec /source/blender/windowmanager | |
parent | 821d481f53b77a3b14ab8d1343dab7ae26f089c9 (diff) |
Fixes - post 2.65a
- Trackpad swipes now behave same as scrollwheel for listview scrolls
(disabling 2d view scroll when mouse over)
- Added back 2.4 debug print for glGetError()
Only useful for developers - to check what goes on when ogl messes up.
- Made more clear print for read factory default. It's not error :)
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 10 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index e462e21d9f4..a42986eba60 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -66,6 +66,8 @@ #include "RNA_access.h" +#include "BIF_gl.h" + #include "UI_interface.h" #include "PIL_time.h" @@ -338,7 +340,7 @@ static int wm_handler_ui_call(bContext *C, wmEventHandler *handler, wmEvent *eve ARegion *region = CTX_wm_region(C); ARegion *menu = CTX_wm_menu(C); static int do_wheel_ui = TRUE; - int is_wheel = ELEM(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE); + int is_wheel = ELEM3(event->type, WHEELUPMOUSE, WHEELDOWNMOUSE, MOUSEPAN); int retval; /* UI code doesn't handle return values - it just always returns break. @@ -2180,6 +2182,12 @@ void wm_event_do_handlers(bContext *C) /* update key configuration after handling events */ WM_keyconfig_update(wm); + + if(G.debug) { + GLenum error = glGetError(); + if (error) + printf("GL error: %s\n", gluErrorString(error)); + } } /* ********** filesector handling ************ */ diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 6a84e3e4e7d..f31aff3d3f8 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -531,7 +531,7 @@ int wm_homefile_read(bContext *C, ReportList *UNUSED(reports), short from_memory } if (U.themes.first == NULL) { - printf("\nError: No valid "STRINGIFY (BLENDER_STARTUP_FILE)", fall back to built-in default.\n\n"); + printf("\nNote: No (valid) "STRINGIFY (BLENDER_STARTUP_FILE)" found, fall back to built-in default.\n\n"); success = 0; } @@ -549,7 +549,7 @@ int wm_homefile_read(bContext *C, ReportList *UNUSED(reports), short from_memory /* check new prefs only after startup.blend was finished */ if (!from_memory && BLI_exists(prefstr)) { int done = BKE_read_file_userdef(prefstr, NULL); - if (done) printf("read new prefs: %s\n", prefstr); + if (done) printf("Read new prefs: %s\n", prefstr); } /* prevent buggy files that had G_FILE_RELATIVE_REMAP written out by mistake. Screws up autosaves otherwise |