diff options
| -rw-r--r-- | release/Makefile | 16 | ||||
| -rw-r--r-- | release/plugins/sequence/scatter.c | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/release/Makefile b/release/Makefile index db19081f60d..89224ef7c4a 100644 --- a/release/Makefile +++ b/release/Makefile @@ -104,6 +104,14 @@ install: package #@cp -r python $(DISTDIR)/python #@rm -fr $(DISTDIR)/python/CVS + ifneq ($(NOSTRIP),true) + @echo "----> Strip blender executable" + ifeq ($(OS),darwin) + @strip -x $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender + else + @strip -x $(DISTDIR)/blender$(EXT0) + endif + endif @echo "----> Copy blender$(EXT0) executable" ifeq ($(TYPE),-static) @cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0) @@ -124,14 +132,6 @@ install: package @rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \ $(DISTDIR)/plugins/*/*.o endif - ifneq ($(NOSTRIP),true) - @echo "----> Strip blender executable" - ifeq ($(OS),darwin) - @strip $(OCGDIR)/bin/blender$(EXT0)/Contents/MacOS/blender - else - @strip $(DISTDIR)/blender$(EXT0) - endif - endif @[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\ echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \ cd $(CONFIG_GUESS) && ./specific.sh ) diff --git a/release/plugins/sequence/scatter.c b/release/plugins/sequence/scatter.c index cba8aeab5a8..b61b53c1a85 100644 --- a/release/plugins/sequence/scatter.c +++ b/release/plugins/sequence/scatter.c @@ -184,7 +184,7 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf int x, y, lr; /* fill imbuf 'out' with black */ - rectop(out, 0,0,0,0,0,32767,32767,rectfill, 0); + ibufrectop(out, ibuf1,0,0,0,0,32767,32767,rectfill, 0); switch (cast->type) { case 0: @@ -223,12 +223,12 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf break; } - rectop(out, ibuf1, 0, y, x, y, 32767, 1, rectcpy, 0); + ibufrectop(out, ibuf1, 0, y, x, y, 32767, 1, rectcpy, 0); if (cast->wrap) { - rectop(out, ibuf1, 0, y, x + sx, y, 32767, 1, rectcpy, 0); - rectop(out, ibuf1, 0, y, x + sx + sx, y, 32767, 1, rectcpy, 0); - rectop(out, ibuf1, 0, y, x - sx, y, 32767, 1, rectcpy, 0); - rectop(out, ibuf1, 0, y, x - sx - sx, y, 32767, 1, rectcpy, 0); + ibufrectop(out, ibuf1, 0, y, x + sx, y, 32767, 1, rectcpy, 0); + ibufrectop(out, ibuf1, 0, y, x + sx + sx, y, 32767, 1, rectcpy, 0); + ibufrectop(out, ibuf1, 0, y, x - sx, y, 32767, 1, rectcpy, 0); + ibufrectop(out, ibuf1, 0, y, x - sx - sx, y, 32767, 1, rectcpy, 0); } } } |