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, 4 insertions, 4 deletions

diff --git a/release/scripts/scripttemplate_pyconstraint.py b/release/scripts/scripttemplate_pyconstraint.py
index 68aa9194435..0215e47a1bd 100644
--- a/release/scripts/scripttemplate_pyconstraint.py
+++ b/release/scripts/scripttemplate_pyconstraint.py
@@ -36,13 +36,13 @@ NUM_TARGETS = 1
 					constraint instance's idproperties
 '''
 def doConstraint(obmatrix, targetmatrices, idprop):
-	# Separate out the tranformation components for easy access.
+	# Separate out the transformation components for easy access.
 	obloc = obmatrix.translationPart()	# Translation
 	obrot = obmatrix.toEuler()			# Rotation
 	obsca = obmatrix.scalePart()		# Scale
 
-	# Define user-settable parameters.\
-	# Must also be defined in getSettings().
+	# Define user-settable parameters
+	# 	Must also be defined in getSettings().
 	if not idprop.has_key('user_toggle'): idprop['user_toggle'] = 1
 	if not idprop.has_key('user_slider'): idprop['user_slider'] = 1.0
 	
@@ -51,7 +51,7 @@ def doConstraint(obmatrix, targetmatrices, idprop):
 
 	
 	# Convert back into a matrix for loc, scale, rotation,
-	mtxloc = Mathutils.TranslationMatrix( obloc )
+	mtxloc = Mathutils.TranslationMatrix(obloc)
 	mtxrot = obrot.toMatrix().resize4x4()
 	mtxsca = Mathutils.Matrix([obsca[0],0,0,0], [0,obsca[1],0,0], [0,0,obsca[2],0], [0,0,0,1])