diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-10-15 03:57:40 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-10-15 03:57:40 +0400 |
| commit | bd7b692f29ef7deb55bfa15933d1ef620730e6a1 (patch) | |
| tree | 75677bbebc309126dbb7a84442d70544fc0bdaf7 /source/blender/windowmanager/intern/wm_operators.c | |
| parent | c8a0e91ac2b4fe2ac046c87f263ed42dfbc6065c (diff) | |
| parent | f87d38b5f518bb436823b5913db8c1b73a108872 (diff) | |
Merge branch 'master' into GPencil_EditStrokes
Diffstat (limited to 'source/blender/windowmanager/intern/wm_operators.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index dca05b3556a..e1bb8637b34 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2098,7 +2098,7 @@ static int wm_operator_winactive_normal(bContext *C) { wmWindow *win = CTX_wm_window(C); - if (win == NULL || win->screen == NULL || win->screen->full != SCREENNORMAL) + if (win == NULL || win->screen == NULL || win->screen->state != SCREENNORMAL) return 0; return 1; @@ -2946,7 +2946,7 @@ static void WM_OT_save_mainfile(wmOperatorType *ot) static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot) { - ot->name = "Toggle Fullscreen"; + ot->name = "Toggle Window Fullscreen"; ot->idname = "WM_OT_window_fullscreen_toggle"; ot->description = "Toggle the current window fullscreen"; |