[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43183] trunk/blender/source/blender/ blenkernel/intern/sound.c: correct error in own commit r43159, unintentionally removed NULL check

Campbell Barton ideasman42 at gmail.com
Thu Jan 5 23:14:51 CET 2012


Revision: 43183
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43183
Author:   campbellbarton
Date:     2012-01-05 22:14:38 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
correct error in own commit r43159, unintentionally removed NULL check

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43159

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sound.c

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c	2012-01-05 21:39:45 UTC (rev 43182)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c	2012-01-05 22:14:38 UTC (rev 43183)
@@ -490,9 +490,11 @@
 
 void sound_move_scene_sound_defaults(struct Scene *scene, struct Sequence* sequence)
 {
-	sound_move_scene_sound(scene, sequence->scene_sound,
-	                       sequence->startdisp, sequence->enddisp,
-	                       sequence->startofs + sequence->anim_startofs);
+	if (sequence->scene_sound) {
+		sound_move_scene_sound(scene, sequence->scene_sound,
+		                       sequence->startdisp, sequence->enddisp,
+		                       sequence->startofs + sequence->anim_startofs);
+	}
 }
 
 void sound_update_scene_sound(void* handle, struct bSound* sound)



More information about the Bf-blender-cvs mailing list