Revision: 30880
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30880
Author: jwilkins
Date: 2010-07-29 22:59:47 +0200 (Thu, 29 Jul 2010)
Log Message:
-----------
startup.blend.c got corrupted by a previous merge
Modified Paths:
--------------
branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
Modified:
branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
2010-07-29 20:08:14 UTC (rev 30879)
+++ branches/soc-2010-jwilkins/source/blender/editors/datafiles/startup.blend.c
2010-07-29 20:59:47 UTC (rev 30880)
@@ -1,1260 +1,756 @@
/* DataToC output of file <startup_blend> */
-int datatoc_startup_blend_size= 353564;
+int datatoc_startup_blend_size= 313704;
char datatoc_startup_blend[]= {
- 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 53, 51, 82, 69, 78, 68, 32, 0, 0,
0,160,153,219,213,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, 24, 1, 0,
0,160,152,219,213,255,127, 0, 0,202, 0, 0, 0, 1, 0, 0, 0,
- 32, 32, 32, 48, 0, 0, 0, 0,250, 0, 0, 0, 1, 0, 0, 1,168, 98,181,
4, 0, 0, 0, 0,120, 11,183, 4, 0, 0, 0, 0,
- 0, 16, 0, 0,128, 32, 4, 0, 60,109,101,109,111,114,121, 50, 62,
0,219,213,255,127, 0, 0,136,106,180, 4, 0, 0, 0, 0,
-128,154,219,213,255,127, 0, 0, 0, 10,136, 0, 0, 0, 0, 0, 44,214,152,
4, 0, 0, 0, 0,217, 15,234, 0, 0, 0, 0, 0,
- 40, 0, 0, 0, 48, 0, 0, 0,224,153,219,213, 32, 0, 0,
0,160,153,219,213,255,127, 0, 0, 72, 88,148, 4, 0, 0, 0, 0,
- 80,153,219,213,255,127, 0, 0, 8,214,152, 4, 0, 0, 0,
0,128,153,219,213,255,127, 0, 0, 33, 18,234, 0, 0, 0, 0, 0,
-253, 0, 0, 0, 0, 0, 0, 0,160,153,219,213,255,127, 0, 0, 32, 0, 0,
0, 82, 69, 78, 68, 72, 88,148, 4, 0, 0, 0, 0,
- 82, 69, 78, 68, 32, 0, 0, 0,160,153,219,213,255,127, 0, 0, 0, 0, 0,
0, 1, 0, 0, 0,136, 11,160, 4, 0, 0, 0, 0,
-208,153,219,213,255,127, 0, 0,223, 24,234, 0, 0, 0, 0, 0, 88,141,172,
4, 0, 0, 0, 0, 72, 88,148, 4, 0, 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, 87, 77, 0, 0, 24, 1, 0, 0,
-136, 11,160, 4, 0, 0, 0, 0,111, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 88,221,171, 4, 0, 0, 0, 0,
- 88,221,171, 4, 0, 0, 0, 0, 88,221,171, 4, 0, 0, 0, 0, 88,221,171,
4, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0,
+ 66, 76, 69, 78, 68, 69, 82, 95,
+118, 50, 53, 51, 82, 69, 78, 68, 32, 0, 0, 0,156,231,174, 2, 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, 16, 1, 0, 0,
+188,230,174, 2,202, 0, 0, 0, 1, 0, 0, 0, 32, 32, 32, 49, 1, 0, 0,
0,250, 0, 0, 0, 1, 0, 0, 1, 56,118, 37, 3,
+128, 46, 39, 3, 0, 16, 0, 0,128, 32, 4, 0, 67, 58, 92, 68,111,
99,117,109,101,110,116,115, 32, 97,110,100, 32, 83,101,116,
+116,105,110,103,115, 92, 80,104,111,101,110,105,120, 92, 65,112,112,108,105,
99, 97,116,105,111,110, 32, 68, 97,116, 97, 92, 66,
+108,101,110,100,101,114, 32, 70,111,117,110,100, 97,116,105,111,110, 92,
66,108,101,110,100,101,114, 92, 50, 46, 53, 51, 92, 99,
+111,110,102,105,103, 92,115,116, 97,114,116,117,112, 46, 98,108,101,110,100,
0,204,204,204,204,204,204,204,204,204,204,204,204,
+204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
+204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
+204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
+204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,
87, 77, 0, 0,
+168, 0, 0, 0,224,204, 36, 3,111, 1, 0, 0, 1, 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, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,240,205, 36, 3,240,205, 36, 3,240,205, 36, 3,240,205, 36,
3, 3, 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, 16, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0,
0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,
+200,200, 36, 3,200,200, 36, 3,200,200, 36, 3,200,201, 36, 3,200,201, 36,
3,200,201, 36, 3, 68, 65, 84, 65,148, 0, 0, 0,
+240,205, 36, 3,112, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 72, 71, 99, 3, 1, 0, 0, 0, 0, 0, 0, 0,
+ 56,118, 37, 3, 0, 0, 0, 0, 68,101,102, 97,117,108,116, 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, 80, 0,136, 6,202, 3, 0, 0, 0,
0, 1, 0,238, 3, 0, 0, 1, 0, 0, 0, 0, 0,
+ 0, 74, 99, 3, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0,
0, 80, 66, 29, 3,224, 14, 15, 3,224, 14, 15, 3,
+120, 75, 99, 3,240, 76, 99, 3,104, 78, 99, 3,104, 78, 99, 3,104, 70, 99,
3, 88, 80, 29, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+ 83, 78, 0, 0,140, 0, 0, 0,232,206, 36, 3,196, 0, 0, 0, 1, 0, 0,
0, 40, 30, 37, 3, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 83, 82, 65,110,105,109, 97,116,105,111,110, 0, 46, 48, 48,
49, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,216,207, 36, 3,208,215, 36, 3, 72,216, 36,
3, 72,230, 36, 3,200,230, 36, 3,248, 20, 37, 3,
+ 0, 0, 0, 0, 0, 0, 0, 0,128, 46, 39, 3, 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,
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, 40, 53,161, 4, 0, 0, 0, 0,
- 40, 53,161, 4, 0, 0, 0, 0, 40, 53,161, 4, 0, 0, 0, 0,184,202,186,
4, 0, 0, 0, 0,184,202,186, 4, 0, 0, 0, 0,
-184,202,186, 4, 0, 0, 0, 0, 68, 65, 84, 65,224, 0, 0, 0, 88,221,171,
4, 0, 0, 0, 0,112, 1, 0, 0, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,116,103,
3, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
-168, 98,181, 4, 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, 30,
0,118, 7, 97, 4, 0, 0, 0, 0, 1, 0,238, 3,
- 0, 0, 1, 0, 0, 0, 0, 0, 8, 54,124, 3, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 3, 0, 0, 0, 0, 0, 0, 0, 88,243,171, 4, 0, 0, 0, 0,248, 75,132,
3, 0, 0, 0, 0,248, 75,132, 3, 0, 0, 0, 0,
-104,203,186, 4, 0, 0, 0, 0, 56,204,186, 4, 0, 0, 0, 0, 8,205,186,
4, 0, 0, 0, 0, 8,205,186, 4, 0, 0, 0, 0,
-232, 94,179, 4, 0, 0, 0, 0, 40,117,132, 3, 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,232, 12,160, 4, 0, 0, 0, 0,196, 0, 0,
0, 1, 0, 0, 0,152, 10,181, 4, 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, 65,110,105,109, 97,116,
-105,111,110, 0, 46, 48, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-168, 93,124, 3, 0, 0, 0, 0,200,161,124, 3, 0, 0, 0, 0,104,183,174,
4, 0, 0, 0, 0,104, 25,160, 4, 0, 0, 0, 0,
-136,144,172, 4, 0, 0, 0, 0, 8, 1,181, 4, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-120, 11,183, 4, 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, 0, 0, 0, 0, 0, 40, 16,178,
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,168, 93,124,
3, 0, 0, 0, 0,197, 0, 0, 0, 1, 0, 0, 0,
-184, 35,173, 4, 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,184, 35,173, 4, 0, 0, 0, 0,197, 0, 0,
0, 1, 0, 0, 0,104,186,114, 3, 0, 0, 0, 0,
-168, 93,124, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97,
4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,
-104,186,114, 3, 0, 0, 0, 0,197, 0, 0, 0, 1, 0, 0, 0,248,120,124,
3, 0, 0, 0, 0,184, 35,173, 4, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,118, 7, 97, 4, 0, 0, 0, 0, 68, 65, 84,
65, 32, 0, 0, 0,248,120,124, 3, 0, 0, 0, 0,
-197, 0, 0, 0, 1, 0, 0, 0, 40,121,171, 4, 0, 0, 0, 0,104,186,114,
3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-118, 7, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, 40,121,171,
4, 0, 0, 0, 0,197, 0, 0, 0, 1, 0, 0, 0,
-168, 79,173, 4, 0, 0, 0, 0,248,120,124, 3, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 70, 4, 1, 0, 0, 0,
- 68, 65, 84, 65, 32, 0, 0, 0,168, 79,173, 4, 0, 0, 0, 0,197, 0, 0,
0, 1, 0, 0, 0,248,243,174, 4, 0, 0, 0, 0,
- 40,121,171, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,118, 7, 70,
4, 1, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,
-248,243,174, 4, 0, 0, 0, 0,197, 0, 0, 0, 1, 0, 0, 0,184, 30,160,
4, 0, 0, 0, 0,168, 79,173, 4, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 44, 6, 0, 0, 0, 0, 0, 0, 68, 65, 84,
65, 32, 0, 0, 0,184, 30,160, 4, 0, 0, 0, 0,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
