The stuff in release/plugins/include was duplcated in

source/blender/blenpluginapi  So I removed the stuff in the release dir
after merging changes and updated the Makefile.

Kent

4 files changed, 0 insertions, 462 deletions

diff --git a/release/plugins/include/floatpatch.h b/release/plugins/include/floatpatch.h
deleted file mode 100644
index 805a7c84da7..00000000000
--- a/release/plugins/include/floatpatch.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef FLOATPATCH_H
-#define FLOATPATCH_H
-
-/* floating point libs differ at systems... with these defines it comilies at all! */
-
-#ifdef MIPS1
-#else
-
-#define fabsf(a)	fabs((double)(a))
-
-#define facos		acosf
-#define acosf(a)	acos((double)(a))
-
-#define fasin		asinf
-#define asinf(a)	asin((double)(a))
-
-#define fatan		atanf
-#define atanf(a)	atan((double)(a))
-
-#define fatan2			atan2f
-#define atan2f(a, b)	atan2((double)(a), (double)(b))
-
-#define fmodf(a, b)		fmod((double)(a), (double)(b))
-
-#define fcos		cosf
-#define cosf(a)		cos((double)(a))
-
-#define fsin		sinf
-#define sinf(a)		sin((double)(a))
-
-#define ftan		tanf
-#define tanf(a)		tan((double)(a))
-
-#define fexp		expf
-#define expf(a)		exp((double)(a))
-
-#define flog		logf
-#define logf(a)		log((double)(a))
-
-#define flog10		log10f
-#define log10f(a)	log10((double)(a))
-
-#define fsqrt		sqrtf
-#define sqrtf(a)	sqrt((double)(a))
-
-#define fceil		ceilf
-#define ceilf(a)	ceil((double)(a))
-
-#define ffloor		floorf
-#define floorf(a)	floor((double)(a))
-
-#define fpow		powf
-#define powf(a, b)	pow((double)(a), (double)(b))
-
-/* #endif  */
-
-#endif
-
-#endif /* FLOATPATCH_H */
-
diff --git a/release/plugins/include/iff.h b/release/plugins/include/iff.h
deleted file mode 100644
index 6c7a2c062d4..00000000000
--- a/release/plugins/include/iff.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef IFF_H
-#define IFF_H
-
-#include <sys/types.h>
-#include "util.h"
-
-#define IB_rect			(1 << 0)
-#define IB_planes		(1 << 1)
-#define IB_cmap			(1 << 2)
-#define IB_test			(1 << 7)
-
-#define IB_fields		(1 << 11)
-#define IB_yuv			(1 << 12)
-#define IB_zbuf			(1 << 13)
-#define IB_rgba			(1 << 14)
-
-#define AMI	    (1 << 31)
-#define Anim	(1 << 29)
-#define TGA	    (1 << 28)
-#define JPG		(1 << 27)
-
-#define RAWTGA	(TGA | 1)
-
-#define JPG_STD	(JPG | (0 << 8))
-#define JPG_VID	(JPG | (1 << 8))
-#define JPG_JST	(JPG | (2 << 8))
-#define JPG_MAX	(JPG | (3 << 8))
-#define JPG_MSK	(0xffffff00)
-
-#define AM_ham	    (0x0800 | AMI)
-#define AM_hbrite   (0x0080 | AMI)
-#define AM_lace	    (0x0004 | AMI)
-#define AM_hires    (0x8000 | AMI)
-#define AM_hblace   (AM_hbrite | AM_lace)
-#define AM_hilace   (AM_hires | AM_lace)
-#define AM_hamlace  (AM_ham | AM_lace)
-
-#define RGB888	1
-#define RGB555	2
-#define DYUV	3
-#define CLUT8	4
-#define CLUT7	5
-#define CLUT4	6
-#define CLUT3	7
-#define RL7	8
-#define RL3	9
-#define MPLTE	10
-
-#define DYUV1	0
-#define C233	1
-#define YUVX	2
-#define HAMX	3
-#define TANX	4
-
-#define AN_c233			(Anim | C233)
-#define AN_yuvx			(Anim | YUVX)
-#define AN_hamx			(Anim | HAMX)
-#define AN_tanx			(Anim | TANX)
-
-#define IS_amiga(x)		(x->ftype & AMI)
-#define IS_ham(x)		((x->ftype & AM_ham) == AM_ham)
-#define IS_hbrite(x)	((x->ftype & AM_hbrite) == AM_hbrite)
-#define IS_lace(x)		((x->ftype & AM_lace) == AM_lace)
-#define IS_hires(x)		((x->ftype & AM_hires) == AM_hires)
-#define IS_hblace(x)	((x->ftype & AM_hblace) == AM_hblace)
-#define IS_hilace(x)	((x->ftype & AM_hilace) == AM_hilace)
-#define IS_hamlace(x)	((x->ftype & AM_hamlace) == AM_hamlace)
-
-#define IS_anim(x)		(x->ftype & Anim)
-#define IS_hamx(x)		(x->ftype == AN_hamx)
-
-#define IS_tga(x)		(x->ftype & TGA)
-#define IS_tim(x)		(x->ftype & TIM)
-
-#define IMAGIC 	0732
-#define IS_iris(x)		(x->ftype == IMAGIC)
-
-#define IS_jpg(x)		(x->ftype & JPG)
-#define IS_stdjpg(x)	((x->ftype & JPG_MSK) == JPG_STD)
-#define IS_vidjpg(x)	((x->ftype & JPG_MSK) == JPG_VID)
-#define IS_jstjpg(x)	((x->ftype & JPG_MSK) == JPG_JST)
-#define IS_maxjpg(x)	((x->ftype & JPG_MSK) == JPG_MAX)
-
-#define AN_INIT an_stringdec = stringdec; an_stringenc = stringenc;
-
-typedef struct ImBuf{
-	short	x,y;		/* breedte in pixels, hoogte in scanlines */
-	short	skipx;		/* breedte in ints om bij volgende scanline te komen */
-	uchar	depth;		/* actieve aantal bits/bitplanes */
-	uchar	cbits;		/* aantal active bits in cmap */
-	ushort	mincol;
-	ushort	maxcol;
-	int	type;		/* 0=abgr, 1=bitplanes */
-	int	ftype;
-	uint	*cmap;		/* int array van kleuren */
-	uint	*rect;		/* databuffer */
-	uint	**planes;	/* bitplanes */
-	uchar	*chardata;	/* voor cdi-compressie */
-	int	flags;
-	int	mall;		/* wat is er intern gemalloced en mag weer vrijgegeven worden */
-	short	xorig, yorig;
-	char	name[127];
-	char	namenull;
-	int	userflags;
-	int	*zbuf;
-	void	*userdata;
-} ImBuf;
-
-extern struct ImBuf *allocImBuf(short,short,uchar,uint,uchar);
-extern struct ImBuf *dupImBuf(struct ImBuf *);
-extern void freeImBuf(struct ImBuf*);
-
-extern short converttocmap(struct ImBuf* ibuf);
-
-extern short saveiff(struct ImBuf *,char *,int);
-
-extern struct ImBuf *loadiffmem(int *,int);
-extern struct ImBuf *loadifffile(int,int);
-extern struct ImBuf *loadiffname(char *,int);
-extern struct ImBuf *testiffname(char *,int);
-
-extern struct ImBuf *onehalf(struct ImBuf *);
-extern struct ImBuf *onethird(struct ImBuf *);
-extern struct ImBuf *halflace(struct ImBuf *);
-extern struct ImBuf *half_x(struct ImBuf *);
-extern struct ImBuf *half_y(struct ImBuf *);
-extern struct ImBuf *double_x(struct ImBuf *);
-extern struct ImBuf *double_y(struct ImBuf *);
-extern struct ImBuf *double_fast_x(struct ImBuf *);
-extern struct ImBuf *double_fast_y(struct ImBuf *);
-
-extern int ispic(char *);
-
-extern void floyd(struct ImBuf *, short, short);
-extern void dit2(struct ImBuf *, short, short);
-extern void dit3(struct ImBuf *, short, short);
-extern void dit4(struct ImBuf *, short, short);
-extern void dit0(struct ImBuf *, short, short);
-extern void (*ditherfunc)(struct ImBuf *, short, short);
-
-extern struct ImBuf *scaleImBuf(struct ImBuf *, short, short);
-extern struct ImBuf *scalefastImBuf(struct ImBuf *, short, short);
-extern struct ImBuf *scalefieldImBuf(struct ImBuf *, short, short);
-extern struct ImBuf *scalefastfieldImBuf(struct ImBuf *, short, short);
-
-extern long getdither();
-
-#endif /* IFF_H */
diff --git a/release/plugins/include/plugin.h b/release/plugins/include/plugin.h
deleted file mode 100644
index d09959c54ab..00000000000
--- a/release/plugins/include/plugin.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef PLUGIN_H
-#define PLUGIN_H
-
-#include "iff.h"
-#include "util.h"
-#include "floatpatch.h"
-
-#define B_PLUGIN_VERSION	3
-
-typedef	int (*TexDoit)(int, void*, float*, float*, float*);
-typedef void (*SeqDoit)(void*, float, float, int, int, ImBuf*, ImBuf*, ImBuf*, ImBuf*);
-
-typedef struct VarStruct {
-	int type;
-	char name[16];
-	float def, min, max;
-	char tip[80];
-} VarStruct;
-
-typedef struct _PluginInfo {
-	char *name;
-	char *snames;
-
-	int stypes;
-	int nvars;
-	VarStruct *varstr;
-	float *result;
-	float *cfra;
-
-	void (*init)(void);
-	void (*callback)(int);
-	TexDoit tex_doit;
-	SeqDoit seq_doit;
-} PluginInfo;
-
-int plugin_tex_getversion(void);
-int plugin_seq_getversion(void);
-void plugin_getinfo(PluginInfo *);
-
-/* *************** defines for button types ************** */
-
-#define INT	96
-#define FLO	128
-
-#define TOG	(3<<9)
-#define	NUM	(5<<9)
-#define LABEL	(10<<9)
-#define NUMSLI	(14<<9)
-
-
-/* *************** API functions ******************** */
-
-	/* derived from the famous Perlin noise */
-extern float hnoise(float noisesize, float x, float y, float z);
-	/* the original Perlin noise */
-extern float hnoisep(float noisesize, float x, float y, float z);
-
-	/* soft turbulence */
-extern float turbulence(float noisesize, float x, float y, float z, int depth);
-	/* hard turbulence */
-extern float turbulence1(float noisesize, float x, float y, float z, int depth);
-
-#endif /* PLUGIN_H */
diff --git a/release/plugins/include/util.h b/release/plugins/include/util.h
deleted file mode 100644
index 19b51b1fce3..00000000000
--- a/release/plugins/include/util.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef	NULL
-#define NULL			0
-#endif
-
-#ifndef	FALSE
-#define FALSE			0
-#endif
-
-#ifndef	TRUE
-#define TRUE			1
-#endif
-
-#ifndef ulong
-#define ulong unsigned long
-#endif
-
-#ifndef ushort
-#define ushort unsigned short
-#endif
-
-#ifndef uchar
-#define uchar unsigned char
-#endif
-
-#ifndef uint
-#define uint unsigned int
-#endif
-
-#define MIN2(x,y)		( (x)<(y) ? (x) : (y) )
-#define MIN3(x,y,z)		MIN2( MIN2((x),(y)) , (z) )
-#define MIN4(x,y,z,a)		MIN2( MIN2((x),(y)) , MIN2((z),(a)) )
-
-#define MAX2(x,y)		( (x)>(y) ? (x) : (y) )
-#define MAX3(x,y,z)		MAX2( MAX2((x),(y)) , (z) )
-#define MAX4(x,y,z,a)		MAX2( MAX2((x),(y)) , MAX2((z),(a)) )
-
-#define SWAP(type, a, b)	{ type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
-
-#ifndef ABS
-#define ABS(x)	((x) < 0 ? -(x) : (x))
-#endif
-
-#ifndef CLAMP
-#define CLAMP(val, low, high) ((val>high)?high:((val<low)?low:val))
-#endif
-
-#define PRINT(d, var1)	printf(# var1 ":%" # d "\n", var1)
-#define PRINT2(d, e, var1, var2)	printf(# var1 ":%" # d " " # var2 ":%" # e "\n", var1, var2)
-#define PRINT3(d, e, f, var1, var2, var3)	printf(# var1 ":%" # d " " # var2 ":%" # e " " # var3 ":%" # f "\n", var1, var2, var3)
-#define PRINT4(d, e, f, g, var1, var2, var3, var4)	printf(# var1 ":%" # d " " # var2 ":%" # e " " # var3 ":%" # f " " # var4 ":%" # g "\n", var1, var2, var3, var4)
-
-extern          void *mallocN(int len, char *str);
-extern          void *callocN(int len, char *str);
-extern          short freeN(void *vmemh);   
-
-#endif /* UTIL_H */