X-Git-Url: https://git.blender.org/gitweb/gitweb.cgi/blender-staging.git/blobdiff_plain/96897d567493964c2280b5069b7f70363c388185..57932e1752ea0d9b9b0f3f69327bca83297d7e07:/release/plugins/texture/tiles.c

diff --git a/release/plugins/texture/tiles.c b/release/plugins/texture/tiles.c
index 9977675c389..bc2bf3a8140 100644
--- a/release/plugins/texture/tiles.c
+++ b/release/plugins/texture/tiles.c
@@ -1,15 +1,12 @@
  /**
  * $Id$
  *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ * ***** BEGIN GPL 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.
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -27,7 +24,7 @@
  *
  * Contributor(s): none yet.
  *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * ***** END GPL LICENSE BLOCK *****
  */
 
 #include "math.h"
@@ -65,8 +62,8 @@ float result[8];
 
 float cfra;
 
-int plugin_tex_doit(int, Cast *, float *, float *, float *);
-
+int plugin_tex_doit(int, Cast *, float *, float *, float *, float *);
+void plugin_instance_init(Cast*);
 
 /* ******************** Fixed functions ***************** */
 
@@ -83,6 +80,14 @@ void plugin_init(void)
 {
 }
 
+/* 
+ * initialize any data for a particular instance of
+ * the plugin here
+ */
+void plugin_instance_init(Cast *cast)
+{
+}
+
 /* this function should not be changed: */
 
 void plugin_getinfo(PluginInfo *info)
@@ -99,6 +104,8 @@ void plugin_getinfo(PluginInfo *info)
 	info->init= plugin_init;
 	info->tex_doit=  (TexDoit) plugin_tex_doit;
 	info->callback= plugin_but_changed;
+	info->instance_init= (void (*)(void *)) plugin_instance_init;
+
 }
 
 /* ************************************************************
@@ -143,12 +150,7 @@ float sample_wave(float freq, float coord, float pixsize)
 	return retval;
 }
 
-/* return 0: One channel texture
-   return 1: RGB texture
-   return 2: Normals texture */
-
-
-int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt)
+int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt, float *result)
 {
 	float xwave, ywave;
 	
@@ -172,5 +174,5 @@ int plugin_tex_doit(int stype, Cast *cast, float *texvec, float *dxt, float *dyt
 		else result[0]= ywave-xwave;
 	}
 
-	return 0;
+	return TEX_INT;
 }