diff options
| author | Severin <julian_eisel@web.de> | 2014-12-14 20:46:51 +0300 |
|---|---|---|
| committer | Severin <julian_eisel@web.de> | 2014-12-14 20:51:14 +0300 |
| commit | ae6f62c4e2090ea8987bad9af67fad33cbe55966 (patch) | |
| tree | 407936ed68bb4626f9da3334e312b22345e7217d /source/blender/windowmanager | |
| parent | c1d3532d2cbf85e1339026b7f77a4e8730124a50 (diff) | |
IME fix: Quit two assert failures
We could now also remove the win->ime_data assert in wm_window_IME_end,
but think it's better to leave it for further development.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 0b33dbb2c32..52fcdd797cb 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1526,9 +1526,10 @@ bool WM_window_is_fullscreen(wmWindow *win) #ifdef WITH_INPUT_IME +/* note: keep in mind wm_window_IME_begin is also used to reposition the IME window */ void wm_window_IME_begin(wmWindow *win, int x, int y, int w, int h, bool complete) { - BLI_assert(win && (win->ime_data == NULL)); + BLI_assert(win); GHOST_BeginIME(win->ghostwin, x, win->sizey - y, w, h, complete); } |