Merging r57816 through r57896 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / windowmanager / intern / wm_operators.c
index 0771e6b8f5ae0d249a0ad60c523e23a10e6276e8..42e72f521371545fa47c79f9b6c8a21f6317ccb5 100644 (file)
@@ -1674,7 +1674,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
        uiItemStringO(col, IFACE_("Credits"), ICON_URL, "WM_OT_url_open", "url",
                      "http://www.blender.org/development/credits");
        uiItemStringO(col, IFACE_("Release Log"), ICON_URL, "WM_OT_url_open", "url",
-                     "http://www.blender.org/development/release-logs/blender-267");
+                     "http://www.blender.org/development/release-logs/blender-268");
        uiItemStringO(col, IFACE_("Manual"), ICON_URL, "WM_OT_url_open", "url",
                      "http://wiki.blender.org/index.php/Doc:2.6/Manual");
        uiItemStringO(col, IFACE_("Blender Website"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org");
@@ -3021,7 +3021,7 @@ static void tweak_gesture_modal(bContext *C, const wmEvent *event)
                        }
                        break;
                default:
-                       if (!ISTIMER(event->type)) {
+                       if (!ISTIMER(event->type) && event->type != EVENT_NONE) {
                                WM_gesture_end(C, gesture);
                        }
                        break;