[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14517] trunk/blender/source/blender: Patch from Paprmh (Rob)

[Kent Mein]

Revision: 14517
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14517
Author:   sirdude
Date:     2008-04-22 16:53:15 +0200 (Tue, 22 Apr 2008)

Log Message:
-----------
Patch from Paprmh (Rob)

forgot to update the check for valid sequence plugin version #
(The version bump didn't affect sequence plugins so missed it)

This patch also brought the plugin includes back inline with
imbuf stuff.  I'm putting it on my todo to see if we can't
remove this duplication so that this is not a reoccuring issue.

Kent

Modified Paths:
--------------
    trunk/blender/source/blender/blenpluginapi/iff.h
    trunk/blender/source/blender/src/seqeffects.c

Modified: trunk/blender/source/blender/blenpluginapi/iff.h
===================================================================
--- trunk/blender/source/blender/blenpluginapi/iff.h	2008-04-22 14:40:24 UTC (rev 14516)
+++ trunk/blender/source/blender/blenpluginapi/iff.h	2008-04-22 14:53:15 UTC (rev 14517)
@@ -151,7 +151,7 @@
 	int	userflags;			/**< Used to set imbuf to Dirty and other stuff */
 	int	*zbuf;				/**< z buffer data, original zbuffer */
 	float *zbuf_float;		/**< z buffer data, camera coordinates */
-	void *userdata;	
+	void *userdata;			/**< temporary storage, only used by baking at the moment */
 	unsigned char *encodedbuffer;     /**< Compressed image only used with png currently */
 	unsigned int   encodedsize;       /**< Size of data written to encodedbuffer */
 	unsigned int   encodedbuffersize; /**< Size of encodedbuffer */
@@ -161,6 +161,7 @@
 	float dither;			/**< random dither value, for conversion from float -> byte rect */
 	
 	struct MEM_CacheLimiterHandle_s * c_handle; /**< handle for cache limiter */
+	struct ImgInfo * img_info;
 	int refcounter;			/**< Refcounter for multiple users */
 	int index;				/**< reference index for ImBuf lists */
 	

Modified: trunk/blender/source/blender/src/seqeffects.c
===================================================================
--- trunk/blender/source/blender/src/seqeffects.c	2008-04-22 14:40:24 UTC (rev 14516)
+++ trunk/blender/source/blender/src/seqeffects.c	2008-04-22 14:53:15 UTC (rev 14517)
@@ -101,7 +101,7 @@
 
 		if (version != 0) {
 			pis->version= version();
-			if (pis->version >= 2 && pis->version <= 5) {
+			if (pis->version >= 2 && pis->version <= 6) {
 				int (*info_func)(PluginInfo *);
 				PluginInfo *info= (PluginInfo*) MEM_mallocN(sizeof(PluginInfo), "plugin_info");