Merging r50037 through r50039 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 20 Aug 2012 10:57:51 +0000 (10:57 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 20 Aug 2012 10:57:51 +0000 (10:57 +0000)
1  2 
source/blender/blenkernel/intern/sequencer.c

index 7daa7fd723c99f80f2132ece9af8f4ed3acc4958,3699f802c9188fa086adae20e2c8c7f88eaf46e5..edbbbe10300d841fcd95bc67d3b7ee0f166c2890
@@@ -205,14 -205,7 +205,7 @@@ void BKE_sequence_free(Scene *scene, Se
        }
  
        /* free modifiers */
-       if (seq->modifiers.first) {
-               SequenceModifierData *smd, *smd_next;
-               for (smd = seq->modifiers.first; smd; smd = smd_next) {
-                       smd_next = smd->next;
-                       BKE_sequence_modifier_free(smd);
-               }
-       }
+       BKE_sequence_modifier_clear(seq);
  
        BKE_sequencer_cache_cleanup_sequence(seq);
        BKE_sequencer_preprocessed_cache_cleanup_sequence(seq);
@@@ -1719,7 -1712,7 +1712,7 @@@ int BKE_sequencer_input_have_to_preproc
        float mul;
  
        if (seq->flag & (SEQ_FILTERY | SEQ_USE_CROP | SEQ_USE_TRANSFORM | SEQ_FLIPX |
 -                       SEQ_FLIPY | SEQ_USE_COLOR_BALANCE | SEQ_MAKE_PREMUL))
 +                       SEQ_FLIPY | SEQ_USE_COLOR_BALANCE | SEQ_MAKE_PREMUL | SEQ_MAKE_FLOAT))
        {
                return TRUE;
        }
@@@ -2574,7 -2567,8 +2567,8 @@@ static ImBuf *seq_render_strip(SeqRende
  
                        ibuf = do_render_strip_uncached(context, seq, cfra);
  
-                       BKE_sequencer_preprocessed_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf);
+                       if (ibuf)
+                               BKE_sequencer_preprocessed_cache_put(context, seq, cfra, SEQ_STRIPELEM_IBUF, ibuf);
                }
        }