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, 24 insertions, 6 deletions

diff --git a/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py b/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
index 44f9e051c8c..c3b2e947ddb 100644
--- a/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
+++ b/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
@@ -13,7 +13,7 @@ class KX_SCA_AddObjectActuator(SCA_IActuator):
 		  
 		  C{ERROR: GameObject I{OBName} has a AddObjectActuator I{ActuatorName} without object (in 'nonactive' layer)}
 	"""
-	def setObject(obj):
+	def setObject(object):
 		"""
 		Sets the game object to add.
 		
@@ -21,17 +21,18 @@ class KX_SCA_AddObjectActuator(SCA_IActuator):
 		
 		If the object does not exist, this function is ignored.
 		
-		obj can either be a L{KX_GameObject} or the name of an object.
+		object can either be a L{KX_GameObject} or the name of an object or None.
 		
-		@type obj: L{KX_GameObject} or string
+		@type object: L{KX_GameObject}, string or None
 		"""
-	def getObject():
+	def getObject(name_only = 0):
 		"""
 		Returns the name of the game object to be added.
 		
 		Returns None if no game object has been assigned to be added.
-		
-		@rtype: string
+		@type name_only: bool
+		@param name_only: optional argument, when 0 return a KX_GameObject
+		@rtype: string, KX_GameObject or None if no object is set
 		"""
 	def setTime(time):
 		"""
@@ -65,6 +66,23 @@ class KX_SCA_AddObjectActuator(SCA_IActuator):
 		
 		@rtype: list [vx, vy, vz]
 		"""
+	def setAngularVelocity(vx, vy, vz):
+		"""
+		Sets the initial angular velocity of added objects.
+		
+		@type vx: float
+		@param vx: the x component of the initial angular velocity.
+		@type vy: float
+		@param vy: the y component of the initial angular velocity.
+		@type vz: float
+		@param vz: the z component of the initial angular velocity.
+		"""
+	def getAngularVelocity():
+		"""
+		Returns the initial angular velocity of added objects.
+		
+		@rtype: list [vx, vy, vz]
+		"""
 	def getLastCreatedObject():
 		"""
 		Returns the last object created by this actuator.