[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13547] trunk/blender/source/blender/src/ seqeffects.c: == Sequencer ==

Peter Schlaile peter at schlaile.de
Sun Feb 3 20:22:35 CET 2008


Revision: 13547
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13547
Author:   schlaile
Date:     2008-02-03 20:22:34 +0100 (Sun, 03 Feb 2008)

Log Message:
-----------
== Sequencer ==

Silenced compiler warnings and possibly fixed crash on broken
blend files.

Modified Paths:
--------------
    trunk/blender/source/blender/src/seqeffects.c

Modified: trunk/blender/source/blender/src/seqeffects.c
===================================================================
--- trunk/blender/source/blender/src/seqeffects.c	2008-02-03 19:10:19 UTC (rev 13546)
+++ trunk/blender/source/blender/src/seqeffects.c	2008-02-03 19:22:34 UTC (rev 13547)
@@ -3006,13 +3006,12 @@
 
 	if (seq->type & SEQ_EFFECT) {
 		rval = get_sequence_effect_impl(seq->type);
+		if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
+			rval.load(seq);
+			seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
+		}
 	}
 
-	if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
-		rval.load(seq);
-		seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
-	}
-
 	return rval;
 }
 
@@ -3022,13 +3021,12 @@
 
 	if (seq->blend_mode != 0) {
 		rval = get_sequence_effect_impl(seq->blend_mode);
+		if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
+			rval.load(seq);
+			seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
+		}
 	}
 
-	if ((seq->flag & SEQ_EFFECT_NOT_LOADED) != 0) {
-		rval.load(seq);
-		seq->flag &= ~SEQ_EFFECT_NOT_LOADED;
-	}
-
 	return rval;
 }
 





More information about the Bf-blender-cvs mailing list