Revision: 43819
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43819
Author:   nazgul
Date:     2012-02-01 08:35:16 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Fix #30028: VSE Paste Strip Crash

Crash was caused by attempting to create strip text from a missed sound 
datablock.
Actual error happened when this sound datablock was missed, but crash isn't nice
anyway and there were no way to repair scene.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c       
2012-02-01 07:44:19 UTC (rev 43818)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c       
2012-02-01 08:35:16 UTC (rev 43819)
@@ -553,7 +553,10 @@
                        BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, 
name);
        }
        else if (seq->type == SEQ_SOUND) {
-               BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, name, 
seq->sound->name);
+               if(seq->sound)
+                       BLI_snprintf(str, sizeof(str), "%d | %s: %s", seq->len, 
name, seq->sound->name);
+               else
+                       BLI_snprintf(str, sizeof(str), "%d | %s", seq->len, 
name);
        }
        else if (seq->type == SEQ_MOVIE) {
                BLI_snprintf(str, sizeof(str), "%d | %s: %s%s", seq->len, name, 
seq->strip->dir, seq->strip->stripdata->name);

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to