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.

1 files changed, 25 insertions, 16 deletions

diff --git a/release/scripts/bpymodules/BPyRegistry.py b/release/scripts/bpymodules/BPyRegistry.py
index f0d6da82d52..4d681e15937 100644
--- a/release/scripts/bpymodules/BPyRegistry.py
+++ b/release/scripts/bpymodules/BPyRegistry.py
@@ -193,14 +193,17 @@ def LoadConfigData (key = None):
 		if bsys.exists(fname): files.append(fname)
 
 	for p in files:
-		f = file(p, 'r')
-		lines = f.readlines()
-		f.close()
-		if lines: # Lines may be blank
-			mainkey = lines[0].split('=')[0].strip()
-			pysrc = "\n".join(lines)
-			exec(pysrc)
-			exec("Registry.SetKey('%s', %s)" % (str(mainkey), mainkey))
+		try:
+			f = file(p, 'r')
+			lines = f.readlines()
+			f.close()
+			if lines: # Lines may be blank
+				mainkey = lines[0].split('=')[0].strip()
+				pysrc = "\n".join(lines)
+				exec(pysrc)
+				exec("Registry.SetKey('%s', %s)" % (str(mainkey), mainkey))
+		except Exception, e:
+			raise Warning(e) # Resend exception as warning
 
 
 def RemoveConfigData (key = None):
@@ -223,8 +226,11 @@ def RemoveConfigData (key = None):
 
 	import os
 
-	for p in files:
-		os.remove(p) # remove the file(s)
+	try:
+		for p in files:
+			os.remove(p) # remove the file(s)
+	except Exception, e:
+		raise Warning(e) # Resend exception as warning
 
 
 def SaveConfigData (key = None):
@@ -250,9 +256,12 @@ def SaveConfigData (key = None):
 
 		if not cfgdict: continue
 
-		filename = bsys.join(_CFG_DIR, "%s%s" % (mainkey, _EXT))
-		f = file(filename, 'w')
-		output = _dict_to_str(mainkey, _sanitize(cfgdict))
-		if output!='None':
-			f.write(output)
-			f.close()
+		try:
+			filename = bsys.join(_CFG_DIR, "%s%s" % (mainkey, _EXT))
+			f = file(filename, 'w')
+			output = _dict_to_str(mainkey, _sanitize(cfgdict))
+			if output!='None':
+				f.write(output)
+				f.close()
+		except Exception, e:
+			raise Warning(e) # Resend exception as warning