Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-07-16 10:28:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-16 10:28:20 +0300
commit6568b6d1cdcaf32487bbcd48b4d20da32954c6f5 (patch)
tree3bf63e3ee722d0e6503df26c269e38f0147e42d5 /source/blender/windowmanager
parent01a8216a4bc8968a108eec5fc50436f4a6ed02a9 (diff)
Fix T45456: Error's in splash don't restore cursor
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_window.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index cc0f333ec02..c5387242206 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -516,6 +516,11 @@ void wm_window_add_ghostwindows(wmWindowManager *wm)
wm_init_state.override_flag &= ~WIN_OVERRIDE_WINSTATE;
}
+ /* without this, cursor restore may fail, T45456 */
+ if (win->cursor == 0) {
+ win->cursor = CURSOR_STD;
+ }
+
wm_window_add_ghostwindow(wm, "Blender", win);
}
/* happens after fileread */