Revision: 22419
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22419
Author: yukishiro
Date: 2009-08-12 23:38:23 +0200 (Wed, 12 Aug 2009)
Log Message:
-----------
revert the startup file
Modified Paths:
--------------
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
Modified:
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
2009-08-12 20:17:07 UTC (rev 22418)
+++ branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
2009-08-12 21:38:23 UTC (rev 22419)
@@ -3186,7 +3186,6 @@
}
-
static void lib_link_mesh(FileData *fd, Main *main)
{
Mesh *me;
Modified:
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
2009-08-12 20:17:07 UTC (rev 22418)
+++ branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
2009-08-12 21:38:23 UTC (rev 22419)
@@ -617,8 +617,8 @@
if(part->id.us>0 || wd->current) {
/* write LibData */
writestruct(wd, ID_PA, "ParticleSettings", 1, part);
+ if (part->id.properties)
IDP_WriteProperty(part->id.properties, wd);
if (part->adt) write_animdata(wd, part->adt);
- if (part->adt) write_animdata(wd, part->adt);
writestruct(wd, DATA, "PartDeflect", 1, part->pd);
writestruct(wd, DATA, "PartDeflect", 1, part->pd2);
@@ -1424,9 +1424,9 @@
/* when using partial visibility, the MEdge and
MFace layers
are smaller than the original, so their type
and count is
passed to make this work */
- if (layer->type == partial_type) count =
partial_count;
+ if (layer->type != partial_type) datasize=
structnum*count;
+ else datasize= structnum*partial_count;
- datasize= structnum*count;
writestruct(wd, DATA, structname, datasize,
layer->data);
}
else
Modified: branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
===================================================================
--- branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
2009-08-12 20:17:07 UTC (rev 22418)
+++ branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
2009-08-12 21:38:23 UTC (rev 22419)
@@ -1,948 +1,871 @@
/* DataToC output of file <B_blend> */
-int datatoc_B_blend_size= 89584;
+int datatoc_B_blend_size= 94308;
char datatoc_B_blend[]= {
- 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 53, 48, 82, 69, 78, 68,
- 32, 0, 0, 0, 64,193,127,137,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0,
0, 1, 0, 0, 0,250, 0, 0, 0, 83, 99,101,110,
-101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 71, 76, 79, 66, 40, 0, 0, 0, 48,193,127,137,
-255,127, 0, 0,188, 0, 0, 0, 1, 0, 0, 0, 32, 32, 32, 48, 0, 0, 0,
0,250, 0, 0, 0, 1, 0, 0, 1, 80,181,223, 2,
- 0, 0, 0, 0, 80,252,223, 2, 0, 0, 0, 0, 0, 16, 0, 0,128, 32, 4,
0, 87, 77, 0, 0,224, 0, 0, 0, 16,179,223, 2,
- 0, 0, 0, 0, 78, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, 77, 87,105,110, 77,
97,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 0, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 48,180,223, 2, 0, 0, 0, 0, 48,180,223, 2,
- 0, 0, 0, 0, 48,180,223, 2, 0, 0, 0, 0, 48,180,223, 2, 0, 0, 0,
0, 3, 0, 0, 0, 0, 0, 0, 0, 48,223, 34, 4,
- 0, 0, 0, 0,224,182, 31, 4, 0, 0, 0, 0,128,105,166, 3, 0, 0, 0,
0,128,105,166, 3, 0, 0, 0, 0,176,195,160, 3,
- 0, 0, 0, 0,112,149,166, 3, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0,
0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 48,219, 12, 3,
- 0, 0, 0, 0,208,154,243, 3, 0, 0, 0, 0, 68, 65, 84, 65,224, 0, 0,
0, 48,180,223, 2, 0, 0, 0, 0, 79, 1, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 32, 52,224, 2, 0, 0, 0, 0, 1, 0, 0, 0,
- 0, 0, 0, 0, 80,181,223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,115, 99,114,101,101,110, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 5, 0, 11, 0,246, 4,228, 2, 0, 0, 0, 0,
- 1, 0,238, 3, 0, 0, 1, 0, 0, 0, 0, 0,208,212, 12, 3, 0, 0, 0,
0, 48, 43, 32, 4, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 73,165, 3, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,112,224, 34, 4, 0, 0, 0, 0,112,224, 34, 4, 0, 0, 0,
0,224,219, 12, 3, 0, 0, 0, 0, 80,221, 12, 3,
- 0, 0, 0, 0,176,238, 12, 3, 0, 0, 0, 0, 48, 43, 32, 4, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 83, 78, 0, 0,208, 0, 0, 0, 80,181,223, 2, 0, 0, 0,
0,182, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 82, 83, 99,
-114,101,101,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 96,182,223, 2, 0, 0, 0, 0, 64,187,223, 2, 0, 0, 0,
0,160,187,223, 2, 0, 0, 0, 0, 16,195,223, 2,
- 0, 0, 0, 0,128,195,223, 2, 0, 0, 0, 0,224,233,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 80,252,223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,112,145,132, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0,
0, 96,182,223, 2, 0, 0, 0, 0,183, 0, 0, 0,
- 1, 0, 0, 0,192,182,223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,192,182,223, 2, 0, 0, 0,
0,183, 0, 0, 0, 1, 0, 0, 0, 32,183,223, 2,
- 0, 0, 0, 0, 96,182,223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0,228, 2, 0, 0, 0, 0, 68, 65, 84, 65,
- 32, 0, 0, 0, 32,183,223, 2, 0, 0, 0, 0,183, 0, 0, 0, 1, 0, 0,
0,128,183,223, 2, 0, 0, 0, 0,192,182,223, 2,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,246, 4,228, 2, 0, 0, 0,
0, 68, 65, 84, 65, 32, 0, 0, 0,128,183,223, 2,
- 0, 0, 0, 0,183, 0, 0, 0, 1, 0, 0, 0,224,183,223, 2, 0, 0, 0,
0, 32,183,223, 2, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,246, 4, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0,
0,224,183,223, 2, 0, 0, 0, 0,183, 0, 0, 0,
- 1, 0, 0, 0, 64,184,223, 2, 0, 0, 0, 0,128,183,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,201, 2,
- 1, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, 64,184,223, 2, 0, 0, 0,
0,183, 0, 0, 0, 1, 0, 0, 0,160,184,223, 2,
- 0, 0, 0, 0,224,183,223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,246, 4,201, 2, 1, 0, 0, 0, 68, 65, 84, 65,
- 32, 0, 0, 0,160,184,223, 2, 0, 0, 0, 0,183, 0, 0, 0, 1, 0, 0,
0, 0,185,223, 2, 0, 0, 0, 0, 64,184,223, 2,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 56, 0, 0, 0, 0,
0, 68, 65, 84, 65, 32, 0, 0, 0, 0,185,223, 2,
- 0, 0, 0, 0,183, 0, 0, 0, 1, 0, 0, 0, 96,185,223, 2, 0, 0, 0,
0,160,184,223, 2, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,246, 4, 56, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0,
0, 96,185,223, 2, 0, 0, 0, 0,183, 0, 0, 0,
- 1, 0, 0, 0,192,185,223, 2, 0, 0, 0, 0, 0,185,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 0, 0,
- 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,192,185,223, 2, 0, 0, 0,
0,183, 0, 0, 0, 1, 0, 0, 0, 32,186,223, 2,
- 0, 0, 0, 0, 96,185,223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 8, 4,201, 2, 1, 0, 0, 0, 68, 65, 84, 65,
- 32, 0, 0, 0, 32,186,223, 2, 0, 0, 0, 0,183, 0, 0, 0, 1, 0, 0,
0,128,186,223, 2, 0, 0, 0, 0,192,185,223, 2,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 0, 0, 0, 0,
0, 68, 65, 84, 65, 32, 0, 0, 0,128,186,223, 2,
- 0, 0, 0, 0,183, 0, 0, 0, 1, 0, 0, 0,224,186,223, 2, 0, 0, 0,
0, 32,186,223, 2, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 8, 4, 68, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0,
0,224,186,223, 2, 0, 0, 0, 0,183, 0, 0, 0,
- 1, 0, 0, 0, 64,187,223, 2, 0, 0, 0, 0,128,186,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 4, 52, 2,
- 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, 64,187,223, 2, 0, 0, 0,
0,183, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,224,186,223, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,246, 4, 52, 2, 0, 0, 0, 0, 68, 65, 84, 65,
- 40, 0, 0, 0,160,187,223, 2, 0, 0, 0, 0,184, 0, 0, 0, 1, 0, 0,
0, 16,188,223, 2, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,192,182,223, 2, 0, 0, 0, 0, 32,183,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65,
- 40, 0, 0, 0, 16,188,223, 2, 0, 0, 0, 0,184, 0, 0, 0, 1, 0, 0,
0,128,188,223, 2, 0, 0, 0, 0,160,187,223, 2,
- 0, 0, 0, 0,192,182,223, 2, 0, 0, 0, 0,224,183,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65,
- 40, 0, 0, 0,128,188,223, 2, 0, 0, 0, 0,184, 0, 0, 0, 1, 0, 0,
0,240,188,223, 2, 0, 0, 0, 0, 16,188,223, 2,
- 0, 0, 0, 0, 32,183,223, 2, 0, 0, 0, 0, 64,184,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65,
- 40, 0, 0, 0,240,188,223, 2, 0, 0, 0, 0,184, 0, 0, 0, 1, 0, 0,
0, 96,189,223, 2, 0, 0, 0, 0,128,188,223, 2,
- 0, 0, 0, 0,224,183,223, 2, 0, 0, 0, 0, 64,184,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65,
- 40, 0, 0, 0, 96,189,223, 2, 0, 0, 0, 0,184, 0, 0, 0, 1, 0, 0,
0,208,189,223, 2, 0, 0, 0, 0,240,188,223, 2,
- 0, 0, 0, 0, 96,182,223, 2, 0, 0, 0, 0, 96,185,223, 2, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
