diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-13 18:15:37 +0300 |
| commit | 585208e0e911c985a062dd74b6cc689e4fb63ef8 (patch) | |
| tree | d390abe6663c5619d34dc929d68a24775d24d7fb /source/blender/windowmanager | |
| parent | c99c45a1e3563f4b6dad6eb9498a5ae0f386b93d (diff) | |
| parent | be25a0faa7ff0f64e9d75f5f48c042bb8595f142 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 98ed1c97326..b6317a1f0e2 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4066,6 +4066,7 @@ static const EnumPropertyItem *rna_id_itemf( for (; id; id = id->next) { if ((filter_ids != NULL) && filter_ids(user_data, id) == false) { + i++; continue; } if (local == false || !ID_IS_LINKED(id)) { diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 8d5282b9076..bf23ecfccd0 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -551,7 +551,7 @@ static void wm_window_ghostwindow_add(wmWindowManager *wm, const char *title, wm } /** - * Initialize #wmWindows without ghostwin, open these and clear. + * Initialize #wmWindow without ghostwin, open these and clear. * * window size is read from window, if 0 it uses prefsize * called in #WM_check, also inits stuff after file read. |