archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Updated the scatter program to fix some warnings.

Browse Source 
Modified the Makefile's call to strip so it leaves symbols for
plugins...

Kent
This commit is contained in:
Kent Mein
2003-05-02 20:52:58 +00:00
parent 0aaa02e6b5
commit 3b14d730d9
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
release/Makefile
View File

@@ -104,6 +104,14 @@ install: package
#@cp -r python $(DISTDIR)/python #@cp -r python $(DISTDIR)/python
#@rm -fr $(DISTDIR)/python/CVS #@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" @echo "----> Copy blender$(EXT0) executable"
ifeq ($(TYPE),-static) ifeq ($(TYPE),-static)
@cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0) @cp $(OCGDIR)/bin/blenderstatic$(EXT0) $(DISTDIR)/blender$(EXT0)
@@ -123,14 +131,6 @@ install: package
@$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1; @$(MAKE) -C $(DISTDIR)/plugins all > /dev/null || exit 1;
@rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \ @rm -fr $(DISTDIR)/plugins/CVS $(DISTDIR)/plugins/*/CVS \
$(DISTDIR)/plugins/*/*.o $(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 endif
@[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\ @[ ! -x $(CONFIG_GUESS)/specific.sh ] || (\
echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \ echo "**--> Execute specific.sh in $(CONFIG_GUESS)/" && \

12
release/plugins/sequence/scatter.c
View File

@@ -184,7 +184,7 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf
int x, y, lr; int x, y, lr;
/* fill imbuf 'out' with black */ /* 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) { switch (cast->type) {
case 0: case 0:
@@ -223,12 +223,12 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int sx, int sy, ImBuf
break; 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) { if (cast->wrap) {
rectop(out, ibuf1, 0, y, x + sx, y, 32767, 1, rectcpy, 0); ibufrectop(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 + sx, y, 32767, 1, rectcpy, 0);
rectop(out, ibuf1, 0, y, x - sx, y, 32767, 1, rectcpy, 0); ibufrectop(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 - sx, y, 32767, 1, rectcpy, 0);
} }
} }
} }