[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43976] trunk/blender/source/blender/ makesdna/DNA_genfile.h: fix [#30090] Cloth modifier related crash when loading old file

Campbell Barton ideasman42 at gmail.com
Wed Feb 8 06:20:35 CET 2012


Revision: 43976
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43976
Author:   campbellbarton
Date:     2012-02-08 05:20:23 +0000 (Wed, 08 Feb 2012)
Log Message:
-----------
fix [#30090] Cloth modifier related crash when loading old file

own fault when adding int64 support. `void` type was being used to workaround a different bug in the ClothSimSettings struct.

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

Modified: trunk/blender/source/blender/makesdna/DNA_genfile.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_genfile.h	2012-02-08 04:37:37 UTC (rev 43975)
+++ trunk/blender/source/blender/makesdna/DNA_genfile.h	2012-02-08 05:20:23 UTC (rev 43976)
@@ -48,13 +48,13 @@
 	SDNA_TYPE_ULONG    = 6,
 	SDNA_TYPE_FLOAT    = 7,
 	SDNA_TYPE_DOUBLE   = 8,
-	SDNA_TYPE_INT64    = 9,
-	SDNA_TYPE_UINT64   = 10
-	/* ,SDNA_TYPE_VOID     = 11 */ /* nothing uses yet */
+	/* ,SDNA_TYPE_VOID = 9 */ /* nothing uses yet */
+	SDNA_TYPE_INT64    = 10,
+	SDNA_TYPE_UINT64   = 11
 } eSDNA_Type;
 
 /* define so switch statements don't complain */
-#define SDNA_TYPE_VOID 11
+#define SDNA_TYPE_VOID 9
 
 struct SDNA *DNA_sdna_from_data(void *data, int datalen, int do_endian_swap);
 void DNA_sdna_free(struct SDNA *sdna);




More information about the Bf-blender-cvs mailing list