From 81c199af8365c5a52bb7e8a1a4046acfceea1519 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 13 Mar 2018 23:04:58 +1300 Subject: Fix T54302 - Wrong added scene when adding a scene strip to the Sequencer When adding scene strips to the sequencer, the wrong scenes were getting getting added if some were skipped. For example: Given 4 scenes (A, B, C, D) if you're trying to add the last 3 scenes (B, C, D) as strips to the first scene (A), it would ended up adding "A, B, C" instead of "B, C, D" as expected. Fix provided by Andrew (signal9). --- source/blender/windowmanager/intern/wm_operators.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 8079cd0c2a9..2a50de62dda 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3885,6 +3885,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)) { -- cgit v1.2.3 From bf8f5f51428dd22d06d33fa6c990f8eaccd80b5e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 14 Mar 2018 01:58:46 +1100 Subject: Cleanup: doxygen comments --- source/blender/windowmanager/intern/wm_window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index ceb51171021..cbf06e8c6e9 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -505,7 +505,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. -- cgit v1.2.3