[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58566] trunk/blender/source/blender/ blenkernel/intern/sequencer.c: sequencer: replace warning message with assert, was printing when copying masks and movieclips but went by unnoticed.

[Campbell Barton]

Revision: 58566
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58566
Author:   campbellbarton
Date:     2013-07-24 07:11:00 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
sequencer: replace warning message with assert, was printing when copying masks and movieclips but went by unnoticed.

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

Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-07-24 06:51:04 UTC (rev 58565)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c	2013-07-24 07:11:00 UTC (rev 58566)
@@ -4315,6 +4315,12 @@
 		if (seq->scene_sound)
 			seqn->scene_sound = sound_scene_add_scene_sound_defaults(sce_audio, seqn);
 	}
+	else if (seq->type == SEQ_TYPE_MOVIECLIP) {
+		/* avoid assert */
+	}
+	else if (seq->type == SEQ_TYPE_MASK) {
+		/* avoid assert */
+	}
 	else if (seq->type == SEQ_TYPE_MOVIE) {
 		seqn->strip->stripdata =
 		        MEM_dupallocN(seq->strip->stripdata);
@@ -4326,7 +4332,7 @@
 		if (seq->scene_sound)
 			seqn->scene_sound = sound_add_scene_sound_defaults(sce_audio, seqn);
 
-		seqn->sound->id.us++;
+		id_us_plus((ID *)seqn->sound);
 	}
 	else if (seq->type == SEQ_TYPE_IMAGE) {
 		seqn->strip->stripdata =
@@ -4348,7 +4354,8 @@
 
 	}
 	else {
-		fprintf(stderr, "Aiiiiekkk! sequence type not handled in duplicate!\nExpect a crash now...\n");
+		/* sequence type not handled in duplicate! Expect a crash now... */
+		BLI_assert(0);
 	}
 
 	if (dupe_flag & SEQ_DUPE_UNIQUE_NAME)