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, 167 insertions, 0 deletions

diff --git a/source/gameengine/PyDoc/BL_ShapeActionActuator.py b/source/gameengine/PyDoc/BL_ShapeActionActuator.py
new file mode 100644
index 00000000000..a26b276a2da
--- /dev/null
+++ b/source/gameengine/PyDoc/BL_ShapeActionActuator.py
@@ -0,0 +1,167 @@
+# $Id$
+# Documentation for BL_ShapeActionActuator
+from SCA_IActuator import *
+
+class BL_ShapeActionActuator(SCA_IActuator):
+	"""
+	ShapeAction Actuators apply an shape action to an mesh object.
+	"""
+	def setAction(action, reset = True):
+		"""
+		Sets the current action.
+		
+		@param action: The name of the action to set as the current action.
+		@type action: string
+		@param reset: Optional parameter indicating whether to reset the
+		              blend timer or not.  A value of 1 indicates that the
+		              timer should be reset.  A value of 0 will leave it
+		              unchanged.  If reset is not specified, the timer will
+		              be reset.
+		"""
+
+	def setStart(start):
+		"""
+		Specifies the starting frame of the animation.
+		
+		@param start: the starting frame of the animation
+		@type start: float
+		"""
+
+	def setEnd(end):
+		"""
+		Specifies the ending frame of the animation.
+		
+		@param end: the ending frame of the animation
+		@type end: float
+		"""
+	def setBlendin(blendin):
+		"""
+		Specifies the number of frames of animation to generate
+		when making transitions between actions.
+		
+		@param blendin: the number of frames in transition.
+		@type blendin: float
+		"""
+
+	def setPriority(priority):
+		"""
+		Sets the priority of this actuator.
+		
+		@param priority: Specifies the new priority.  Actuators will lower
+		                 priority numbers will override actuators with higher
+		                 numbers.
+		@type priority: integer
+		"""
+	def setFrame(frame):
+		"""
+		Sets the current frame for the animation.
+		
+		@param frame: Specifies the new current frame for the animation
+		@type frame: float
+		"""
+
+	def setProperty(prop):
+		"""
+		Sets the property to be used in FromProp playback mode.
+		
+		@param prop: the name of the property to use.
+		@type prop: string.
+		"""
+
+	def setBlendtime(blendtime):
+		"""
+		Sets the internal frame timer.
+		 
+		Allows the script to directly modify the internal timer
+		used when generating transitions between actions.  
+		
+		@param blendtime: The new time. This parameter must be in the range from 0.0 to 1.0.
+		@type blendtime: float
+		"""
+
+	def setType(mode):
+		"""
+		Sets the operation mode of the actuator
+
+		@param mode: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
+		@type mode: integer
+		"""
+	
+	def setContinue(cont):
+		"""
+		Set the actions continue option True or False. see getContinue.
+
+		@param cont: The continue option.
+		@type cont: bool
+		"""
+
+	def getType():
+		"""
+		Returns the operation mode of the actuator
+	    
+		@rtype: integer
+		@return: KX_ACTIONACT_PLAY, KX_ACTIONACT_PROPERTY, KX_ACTIONACT_FLIPPER, KX_ACTIONACT_LOOPSTOP, KX_ACTIONACT_LOOPEND
+		"""
+
+	def getContinue():
+		"""
+		When True, the action will always play from where last left off, otherwise negative events to this actuator will reset it to its start frame.
+	    
+		@rtype: bool
+		"""
+	
+	def getAction():
+		"""
+		getAction() returns the name of the action associated with this actuator.
+		
+		@rtype: string
+		"""
+	
+	def getStart():
+		"""
+		Returns the starting frame of the action.
+		
+		@rtype: float
+		"""
+	def getEnd():
+		"""
+		Returns the last frame of the action.
+		
+		@rtype: float
+		"""
+	def getBlendin():
+		"""
+		Returns the number of interpolation animation frames to be generated when this actuator is triggered.
+		
+		@rtype: float
+		"""
+	def getPriority():
+		"""
+		Returns the priority for this actuator.  Actuators with lower Priority numbers will
+		override actuators with higher numbers.
+		
+		@rtype: integer
+		"""
+	def getFrame():
+		"""
+		Returns the current frame number.
+		
+		@rtype: float
+		"""
+	def getProperty():
+		"""
+		Returns the name of the property to be used in FromProp mode.
+		
+		@rtype: string
+		"""
+	def setFrameProperty(prop):
+		"""
+		@param prop: A string specifying the property of the object that will be updated with the action frame number.
+		@type prop: string
+		"""
+	def getFrameProperty():
+		"""
+		Returns the name of the property that is set to the current frame number.
+		
+		@rtype: string
+		"""