[Bf-blender-cvs] [9674b10] multiview: Sequencer: no functional change

Dalai Felinto noreply at git.blender.org
Mon Nov 24 01:40:59 CET 2014


Commit: 9674b1079845b1be15202f651d2b39dc59fb29d6
Author: Dalai Felinto
Date:   Sat Nov 22 13:28:45 2014 -0200
Branches: multiview
https://developer.blender.org/rB9674b1079845b1be15202f651d2b39dc59fb29d6

Sequencer: no functional change

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

M	source/blender/blenkernel/intern/sequencer.c

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

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 515c72c..35566b2 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1474,11 +1474,7 @@ static void seq_open_anim_file(Scene *scene, Sequence *seq)
 				totfiles = 1;
 			}
 
-			if (proxy == NULL) {
-				continue;
-			}
-
-			if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR) {
+			if (proxy && (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR)) {
 				IMB_anim_set_index_dir(sanim->anim, dir);
 			}
 		}




More information about the Bf-blender-cvs mailing list