Revision: 40889
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40889
Author: campbellbarton
Date: 2011-10-10 00:38:32 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
fix [#28860] CRASH loading scene
Sequence strips with missing scenes were missing a NULL check.
Modified Paths:
--------------
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-10-10
00:29:23 UTC (rev 40888)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-10-10
00:38:32 UTC (rev 40889)
@@ -4494,7 +4494,9 @@
seq->scene_sound = NULL;
if(seq->scene) {
seq->scene= newlibadr(fd, sce->id.lib,
seq->scene);
- seq->scene_sound =
sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp,
seq->startofs + seq->anim_startofs);
+ if(seq->scene) {
+ seq->scene_sound =
sound_scene_add_scene_sound(sce, seq, seq->startdisp, seq->enddisp,
seq->startofs + seq->anim_startofs);
+ }
}
if(seq->scene_camera) seq->scene_camera=
newlibadr(fd, sce->id.lib, seq->scene_camera);
if(seq->sound) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
