[Bf-blender-cvs] [81c199af836] master: Fix T54302 - Wrong added scene when adding a scene strip to the Sequencer

Joshua Leung noreply at git.blender.org
Tue Mar 13 11:07:30 CET 2018


Commit: 81c199af8365c5a52bb7e8a1a4046acfceea1519
Author: Joshua Leung
Date:   Tue Mar 13 23:04:58 2018 +1300
Branches: master
https://developer.blender.org/rB81c199af8365c5a52bb7e8a1a4046acfceea1519

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).

===================================================================

M	source/blender/windowmanager/intern/wm_operators.c

===================================================================

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)) {



More information about the Bf-blender-cvs mailing list