Revision: 21482
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21482
Author: blendix
Date: 2009-07-10 13:33:01 +0200 (Fri, 10 Jul 2009)
Log Message:
-----------
2.5: Fix for crash on reload file. Cursor grab should not
assume there to be a window, but also reload file exec was
not returing an OPERATOR_* value.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
===================================================================
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
2009-07-10 11:32:55 UTC (rev 21481)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
2009-07-10 11:33:01 UTC (rev 21482)
@@ -158,7 +158,8 @@
void WM_cursor_grab(wmWindow *win, int val)
{
- GHOST_SetCursorGrab(win->ghostwin, val);
+ if(win)
+ GHOST_SetCursorGrab(win->ghostwin, val);
}
/* afer this you can call restore too */
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-07-10 11:32:55 UTC (rev 21481)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
2009-07-10 11:33:01 UTC (rev 21482)
@@ -334,8 +334,8 @@
WM_event_add_notifier(C, NC_WM|ND_FILEREAD, NULL);
CTX_wm_window_set(C, NULL); /* exits queues */
-
- return success;
+
+ return OPERATOR_FINISHED;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
