X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fcombine.c;fp=src%2Fcombine.c;h=bcc511b34cd7bb3c76c5899a7de025dc184bd9b4;hb=045aa1a089fc49ab5b947d48c3a0d4c8b01452bc;hp=02e714cb87c8d6cce1dc78474e668a7239a456a6;hpb=7a6a6379466188abe92ffebe7b545148c13917b1;p=swftools.git

diff --git a/src/combine.c b/src/combine.c
index 02e714c..bcc511b 100644
--- a/src/combine.c
+++ b/src/combine.c
@@ -367,7 +367,8 @@ void write_master(struct writer_t*w, int spriteid, int replaceddefine, int flags
 		       should be discarded, too, as the object to insert 
 		       isn't a sprite 
 		     */
-		    if(spriteid>=0 && getidfromtag(&master.tags[pos]) == spriteid && !config.isframe)
+		    if(spriteid>=0 && getidfromtag(&master.tags[pos]) == spriteid && 
+			    !config.isframe && config.merge)
 			dontwrite = 1;
 		break;
 	    }