Merge of trunk into blender 2.5:

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416

Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
  later added in trunk also, but reverted partially, specifically revision
  16683. I have left out this reversion in the 2.5 branch since I think it is
  needed there.
  http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
  for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
  -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
  differently. Since this is changed so much, and I don't think those fixes
  would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
  initialized when running with -P. The code that initializes the screen there
  I had to disable, that can't work in 2.5 anymore but left it commented as a
  reminder.

Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.

Still to be done:
* Go over files and functions that were moved to a different location but could
  still use changes that were done in trunk.

4 files changed, 4 insertions, 4 deletions

diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blenderbuttons
index d447b3b4f2c..6993840e51f 100644
--- a/release/datafiles/blenderbuttons
+++ b/release/datafiles/blenderbuttons
diff --git a/release/datafiles/datatoc.c b/release/datafiles/datatoc.c
index 75f789b378a..46b935c7fd6 100644
--- a/release/datafiles/datatoc.c
+++ b/release/datafiles/datatoc.c
@@ -35,7 +35,7 @@ int main(int argc, char**argv) {
 	FILE *fpin,  *fpout;
 	char cname[256];
 	char sizest[256];
-	long size;
+	size_t size;
 	int i;
 	
 	if (argc<1) {
@@ -62,7 +62,7 @@ int main(int argc, char**argv) {
 		if (argv[1][i]=='.') argv[1][i]='_';
 
 	sprintf(sizest, "%d", (int)size);
-	printf ("Input filesize is %d, Output size should be %d\n", size, ((int)size)*4 + strlen("/* DataToC output of file <> */\n\n") + strlen("char datatoc_[]= {\"") + strlen ("\"};\n") + (strlen(argv[1])*3) + strlen(sizest) + strlen("int datatoc__size= ;\n") +(((int)(size/256)+1)*5));
+	printf ("Input filesize is %ld, Output size should be %ld\n", size, ((int)size)*4 + strlen("/* DataToC output of file <> */\n\n") + strlen("char datatoc_[]= {\"") + strlen ("\"};\n") + (strlen(argv[1])*3) + strlen(sizest) + strlen("int datatoc__size= ;\n") +(((int)(size/256)+1)*5));
 	
 	fpout= fopen(cname, "w");
 	if (!fpout) {
@@ -93,8 +93,8 @@ int main(int argc, char**argv) {
 		/* fprintf (fpout, "\\x%02x", getc(fpin)); */
 		fprintf (fpout, "%3d,", getc(fpin));
 	}
-	
-	fprintf (fpout, "\n};\n\n");
+	/* null terminate for the case it is a string */
+	fprintf (fpout, "\n  0};\n\n");
 	
 	fclose(fpin);
 	fclose(fpout);
diff --git a/release/datafiles/preview.blend b/release/datafiles/preview.blend
index c39c26b063d..78ced06bba9 100644
--- a/release/datafiles/preview.blend
+++ b/release/datafiles/preview.blend
diff --git a/release/datafiles/splash.jpg b/release/datafiles/splash.jpg
index da88c0b8eaa..c65b2f37e87 100644
--- a/release/datafiles/splash.jpg
+++ b/release/datafiles/splash.jpg