git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added PNG extraction feature.
[swftools.git]
/
src
/
combine.c
diff --git
a/src/combine.c
b/src/combine.c
index
02e714c
..
bcc511b
100644
(file)
--- 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
*/
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;
}
dontwrite = 1;
break;
}