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, 117 insertions, 9 deletions

diff --git a/source/gameengine/PyDoc/KX_ConstraintActuator.py b/source/gameengine/PyDoc/KX_ConstraintActuator.py
index 9630690e572..7c7ad5aa0fa 100644
--- a/source/gameengine/PyDoc/KX_ConstraintActuator.py
+++ b/source/gameengine/PyDoc/KX_ConstraintActuator.py
@@ -4,7 +4,7 @@ from SCA_IActuator import *
 
 class KX_ConstraintActuator(SCA_IActuator):
 	"""
-	A constraint actuator limits the position or orientation of an object.
+	A constraint actuator limits the position, rotation, distance or orientation of an object.
 	"""
 	def setDamp(time):
 		"""
@@ -24,7 +24,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Sets the lower bound of the constraint.
 		
-		For rotational constraints, lower is specified in degrees.
+		For rotational and orientation constraints, lower is specified in degrees.
 		
 		@type lower: float
 		"""
@@ -32,7 +32,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Gets the lower bound of the constraint.
 		
-		For rotational constraints, the lower bound is returned in radians.
+		For rotational and orientation constraints, the lower bound is returned in radians.
 		
 		@rtype: float
 		"""
@@ -40,7 +40,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Sets the upper bound of the constraint.
 		
-		For rotational constraints, upper is specified in degrees.
+		For rotational and orientation constraints, upper is specified in degrees.
 		
 		@type upper: float
 		"""
@@ -48,7 +48,7 @@ class KX_ConstraintActuator(SCA_IActuator):
 		"""
 		Gets the upper bound of the constraint.
 		
-		For rotational constraints, the upper bound is returned in radians.
+		For rotational and orientation constraints, the upper bound is returned in radians.
 		
 		@rtype: float
 		"""
@@ -58,8 +58,11 @@ class KX_ConstraintActuator(SCA_IActuator):
 		
 		See module L{GameLogic} for valid constraint types.
 		
-		@param limit: Position constraints: KX_CONSTRAINTACT_LOCX, KX_CONSTRAINTACT_LOCY, KX_CONSTRAINTACT_LOCZ, 
-		              Rotation constraints: KX_CONSTRAINTACT_ROTX, KX_CONSTRAINTACT_ROTY or KX_CONSTRAINTACT_ROTZ
+		@param limit:
+			Position constraints: KX_CONSTRAINTACT_LOCX, KX_CONSTRAINTACT_LOCY, KX_CONSTRAINTACT_LOCZ
+			Rotation constraints: KX_CONSTRAINTACT_ROTX, KX_CONSTRAINTACT_ROTY or KX_CONSTRAINTACT_ROTZ
+			Distance contraints: KX_ACT_CONSTRAINT_DIRPX, KX_ACT_CONSTRAINT_DIRPY, KX_ACT_CONSTRAINT_DIRPZ, KX_ACT_CONSTRAINT_DIRNX, KX_ACT_CONSTRAINT_DIRNY, KX_ACT_CONSTRAINT_DIRNZ
+			Orientation constraints: KX_ACT_CONSTRAINT_ORIX, KX_ACT_CONSTRAINT_ORIY, KX_ACT_CONSTRAINT_ORIZ
 		"""
 	def getLimit():
 		"""
@@ -67,6 +70,111 @@ class KX_ConstraintActuator(SCA_IActuator):
 		
 		See module L{GameLogic} for valid constraints.
 		
-		@return: Position constraints: KX_CONSTRAINTACT_LOCX, KX_CONSTRAINTACT_LOCY, KX_CONSTRAINTACT_LOCZ, 
-		         Rotation constraints: KX_CONSTRAINTACT_ROTX, KX_CONSTRAINTACT_ROTY or KX_CONSTRAINTACT_ROTZ
+		@return:
+			Position constraints: KX_CONSTRAINTACT_LOCX, KX_CONSTRAINTACT_LOCY, KX_CONSTRAINTACT_LOCZ, 
+			Rotation constraints: KX_CONSTRAINTACT_ROTX, KX_CONSTRAINTACT_ROTY, KX_CONSTRAINTACT_ROTZ,
+			Distance contraints: KX_ACT_CONSTRAINT_DIRPX, KX_ACT_CONSTRAINT_DIRPY, KX_ACT_CONSTRAINT_DIRPZ, KX_ACT_CONSTRAINT_DIRNX, KX_ACT_CONSTRAINT_DIRNY, KX_ACT_CONSTRAINT_DIRNZ,
+			Orientation constraints: KX_ACT_CONSTRAINT_ORIX, KX_ACT_CONSTRAINT_ORIY, KX_ACT_CONSTRAINT_ORIZ
 		"""
+	def setRotDamp(duration):
+		"""
+		Sets the time constant of the orientation constraint.
+		
+		@param duration: If the duration is negative, it is set to 0.
+		@type duration: integer
+		"""
+	def getRotDamp():
+		""" 
+		Returns the damping time for application of the constraint.
+		
+		@rtype: integer
+		"""
+	def setDirection(vector):
+		"""
+		Sets the reference direction in world coordinate for the orientation constraint
+		
+		@type vector: 3-tuple
+		"""
+	def getDirection():
+		"""
+		Returns the reference direction of the orientation constraint in world coordinate.
+		
+		@rtype: 3-tuple
+		"""
+	def setOption(option):
+		"""
+		Sets several options of the distance constraint.
+		
+		@type option: integer
+		@param option: Binary combination of the following values:
+		               64  : Activate alignment to surface
+		               128 : Detect material rather than property
+		               256 : No deactivation if ray does not hit target
+		               512 : Activate distance control
+		"""
+	def getOption():
+		"""
+		Returns the option parameter.
+		
+		@rtype: integer
+		"""
+	def setTime(duration):
+		"""
+		Sets the activation time of the actuator.
+		
+		@type duration: integer
+		@param duration: The actuator disables itself after this many frame.
+		                 If set to 0 or negative, the actuator is not limited in time.
+		"""
+	def getTime():
+		"""
+		Returns the time parameter.
+		
+		@rtype: integer
+		"""
+	def setProperty(property):
+		"""
+		Sets the name of the property or material for the ray detection of the distance constraint.
+		
+		@type property: string
+		@param property: If empty, the ray will detect any collisioning object.
+		"""
+	def getProperty():
+		"""
+		Returns the property parameter.
+		
+		@rtype: string
+		"""
+	def setDistance(distance):
+		"""
+		Sets the target distance in distance constraint.
+		
+		@type distance: float
+		"""
+	def getDistance():
+		"""
+		Returns the distance parameter.
+		
+		@rtype: float
+		"""
+	def setRayLength(length):
+		"""
+		Sets the maximum ray length of the distance constraint.
+		
+		@type length: float
+		"""
+	def getRayLength():
+		"""
+		Returns the length of the ray
+		
+		@rtype: float
+		"""
+
+
+
+
+
+
+
+
+