[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44570] trunk/blender/source/blender/ makesdna/DNA_node_types.h: * Removed DNA_DEPRECATED tag from old NodeImageFile struct typedef, it doesn't work that way (duh)

[Lukas Toenne]

Revision: 44570
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44570
Author:   lukastoenne
Date:     2012-03-01 08:17:16 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
* Removed DNA_DEPRECATED tag from old NodeImageFile struct typedef, it doesn't work that way (duh)

* Moved format field and added (deprecated) sfra and efra ints to ensure some forward compatibility of file output node. Earlier blender versions will simple interpret the struct as NodeFileImage, so by matching the first fields the numbers can stay somewhat valid.

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_node_types.h

Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-03-01 07:56:15 UTC (rev 44569)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-03-01 08:17:16 UTC (rev 44570)
@@ -352,17 +352,19 @@
 	float hue, sat, val;
 } NodeHueSat;
 
-typedef DNA_DEPRECATED struct NodeImageFile {
+typedef struct NodeImageFile {
 	char name[1024]; /* 1024 = FILE_MAX */
 	struct ImageFormatData im_format;
 	int sfra, efra;
 } NodeImageFile;
 
+/* XXX first struct fields should match NodeImageFile to ensure forward compatibility */
 typedef struct NodeImageMultiFile {
 	char base_path[1024];	/* 1024 = FILE_MAX */
+	ImageFormatData format;
+	int sfra DNA_DEPRECATED, efra DNA_DEPRECATED;	/* XXX old frame rand values from NodeImageFile for forward compatibility */
 	int active_input;		/* selected input in details view list */
 	int pad;
-	ImageFormatData format;
 } NodeImageMultiFile;
 typedef struct NodeImageMultiFileSocket {
 	short use_render_format  DNA_DEPRECATED;