Merging with trunk

15568 - 15963

6 files changed, 64 insertions, 222 deletions

diff --git a/source/blender/python/api2_2x/doc/Armature.py b/source/blender/python/api2_2x/doc/Armature.py
index 68916af6166..9aceb0105e3 100644
--- a/source/blender/python/api2_2x/doc/Armature.py
+++ b/source/blender/python/api2_2x/doc/Armature.py
@@ -89,6 +89,8 @@ Example::
 @type BONE_SELECTED: Constant
 @var TIP_SELECTED: Tip of the Bone is selected
 @type TIP_SELECTED: Constant
+@var LOCKED_EDIT: Prevents the bone from being transformed in editmode
+@type LOCKED_EDIT: Constant
 @var OCTAHEDRON: Bones drawn as octahedrons
 @type OCTAHEDRON: Constant
 @var STICK: Bones drawn as a line
@@ -286,6 +288,7 @@ class Bone:
 			 - Armature.ROOT_SELECTED: Selection of root ball of bone
 			 - Armature.BONE_SELECTED: Selection of bone
 			 - Armature.TIP_SELECTED: Selection of tip ball of bone
+			 - Armature.LOCKED_EDIT: Prevents the bone from being transformed in editmode
 	@type options: List of Constants
 	@ivar subdivision: The number of bone subdivisions.
 	@type subdivision: Int
diff --git a/source/blender/python/api2_2x/doc/IDProp.py b/source/blender/python/api2_2x/doc/IDProp.py
index 0a0df335fa3..01d5136cd70 100644
--- a/source/blender/python/api2_2x/doc/IDProp.py
+++ b/source/blender/python/api2_2x/doc/IDProp.py
@@ -18,7 +18,9 @@ class IDGroup:
 	
 	Note that for arrays, the array type defaults to int unless a float is found
 	while scanning the template list; if any floats are found, then the whole
-	array is float.
+	array is float.  Note that double-precision floating point numbers are used for
+	python-created float ID properties and arrays (though the internal C api does 
+	support single-precision floats, and the python code will read them).
 	
 	You can also delete properties with the del operator.  For example:
 	
diff --git a/source/blender/python/api2_2x/doc/Ipo.py b/source/blender/python/api2_2x/doc/Ipo.py
index c479926ccf3..d1c72f8cb86 100644
--- a/source/blender/python/api2_2x/doc/Ipo.py
+++ b/source/blender/python/api2_2x/doc/Ipo.py
@@ -250,7 +250,7 @@ class Ipo:
 			OfsZ, SizeX, SizeY, SizeZ, texR, texG, texB, DefVar, Col, Nor, Var,
 			Disp.
 			3. Object Ipo: LocX, LocY, LocZ, dLocX, dLocY, dLocZ, RotX, RotY, RotZ,
-			dRotX, dRotY, dRotZ, SizeX, SizeY, SizeZ, dSizeX, dSizeY, dSizeZ,
+			dRotX, dRotY, dRotZ, ScaleX, ScaleY, ScaleZ, dScaleX, dScaleY, dScaleZ,
 			Layer, Time, ColR, ColG, ColB, ColA, FStreng, FFall, Damping,
 			RDamp, Perm.
 			4. Lamp Ipo: Energ, R, G, B, Dist, SpoSi, SpoBl, Quad1, Quad2, HaInt.
@@ -289,7 +289,7 @@ class Ipo:
 			OfsZ, SizeX, SizeY, SizeZ, texR, texG, texB, DefVar, Col, Nor, Var,
 			Disp.
 			3. Object Ipo: LocX, LocY, LocZ, dLocX, dLocY, dLocZ, RotX, RotY, RotZ,
-			dRotX, dRotY, dRotZ, SizeX, SizeY, SizeZ, dSizeX, dSizeY, dSizeZ,
+			dRotX, dRotY, dRotZ, ScaleX, ScaleY, ScaleZ, dScaleX, dScaleY, dScaleZ,
 			Layer, Time, ColR, ColG, ColB, ColA, FStreng, FFall, Damping,
 			RDamp, Perm.
 			4. Lamp Ipo: Energ, R, G, B, Dist, SpoSi, SpoBl, Quad1, Quad2, HaInt.
diff --git a/source/blender/python/api2_2x/doc/LibData.py b/source/blender/python/api2_2x/doc/LibData.py
index 47bd7fdb763..daa6a186531 100644
--- a/source/blender/python/api2_2x/doc/LibData.py
+++ b/source/blender/python/api2_2x/doc/LibData.py
@@ -27,17 +27,37 @@ Example::
 """
 
 def load(filename,relative=False):
-  """
-  Select an existing .blend file for use as a library.  Unlike the 
-  Library module, multiple libraries can be defined at the same time.  
-  
-  @type filename: string
-  @param filename: The filename of a Blender file. Filenames starting with "//" will be loaded relative to the blend file's location.
-  @type relative: boolean
-  @param relative: Convert relative paths to absolute paths (default).  Setting this parameter to True will leave paths relative.
-  @rtype: Library
-  @return: return a L{Library} object.
-  """
+	"""
+	Select an existing .blend file for use as a library.  Unlike the 
+	Library module, multiple libraries can be defined at the same time.  
+	
+	@type filename: string
+	@param filename: The filename of a Blender file. Filenames starting with "//" will be loaded relative to the blend file's location.
+	@type relative: boolean
+	@param relative: Convert relative paths to absolute paths (default).  Setting this parameter to True will leave paths relative.
+	@rtype: Library
+	@return: return a L{Library} object.
+	"""
+
+def paths(link=0):
+	"""
+	Returns a list of paths used in the current blend file.
+	
+	@type link: int
+	@param link: 0 (default if no args given) for all library paths, 1 for directly linked library paths only, 2 for indirectly linked library paths only.
+	@rtype: List
+	@return: return a list of path strings.
+	"""
+
+def replace(pathFrom, pathTo):
+	"""
+	Replaces an existing directly linked path.
+	
+	@type pathFrom: string
+	@param pathFrom: An existing library path.
+	@type pathTo: string
+	@param pathTo: A new library path.
+	"""
 
 class Libraries:
 	"""
diff --git a/source/blender/python/api2_2x/doc/Particle.py b/source/blender/python/api2_2x/doc/Particle.py
index 192ecd5355b..511ad81b45f 100644
--- a/source/blender/python/api2_2x/doc/Particle.py
+++ b/source/blender/python/api2_2x/doc/Particle.py
@@ -56,17 +56,17 @@ class Particle:
 	@type type: int
 	@ivar resolutionGrid: The resolution of the particle grid.
 	@type resolutionGrid: int
-	@ivar startFrame: Frame # to start emitting particles.
+	@ivar startFrame: Frame number to start emitting particles.
 	@type startFrame: float
-	@ivar endFrame: Frame # to stop emitting particles.
+	@ivar endFrame: Frame number to stop emitting particles.
 	@type endFrame: float
 	@ivar editable: Finalize hair to enable editing in particle mode.
 	@type editable: int
 	@ivar amount: The total number of particles.
 	@type amount: int
-	@ivar multireact: React multiple times ( Paricle.REACTON[ 'NEAR' | 'COLLISION' | 'DEATH' ] ).
+	@ivar multireact: React multiple times ( Particle.REACTON[ 'NEAR' | 'COLLISION' | 'DEATH' ] ).
 	@type multireact: int
-	@ivar reactshape: Power of reaction strength dependence on distance to target.
+	@ivar reactshape: Power of reaction strength, dependent on distance to target.
 	@type reactshape: float
 	@ivar hairSegments: Amount of hair segments.
 	@type hairSegments: int
@@ -74,13 +74,13 @@ class Particle:
 	@type lifetime: float
 	@ivar randlife: Give the particle life a random variation.
 	@type randlife: float
-	@ivar randemission: Give the particle life a random variation
+	@ivar randemission: Emit particles in random order.
 	@type randemission: int
-	@ivar particleDistribution: Where to emit particles from  Paricle.EMITFROM[ 'PARTICLE' | 'VOLUME' | 'FACES' | 'VERTS' ] )
+	@ivar particleDistribution: Where to emit particles from  ( Particle.EMITFROM[ 'PARTICLE' | 'VOLUME' | 'FACES' | 'VERTS' ] )
 	@type particleDistribution: int
 	@ivar evenDistribution: Use even distribution from faces based on face areas or edge lengths.
 	@type evenDistribution: int
-	@ivar distribution: How to distribute particles on selected element Paricle.DISTRIBUTION[ 'GRID' | 'RANDOM' | 'JITTERED' ] ).
+	@ivar distribution: How to distribute particles on selected element ( Particle.DISTRIBUTION[ 'GRID' | 'RANDOM' | 'JITTERED' ] ).
 	@type distribution: int
 	@ivar jitterAmount: Amount of jitter applied to the sampling.
 	@type jitterAmount: float
@@ -131,237 +131,56 @@ class Particle:
 		Get the particles locations.
 		A list of tuple is returned in particle mode.
 		A list of list of tuple is returned in hair mode.
-		The tuple is a vector list of 3 or 4 floats in world space (x,y,z, optionnaly the particle's id).
+		The tuple is a vector of 3 or 4 floats in world space (x,y,z,
+optionally the particle's id).
 		@type all: int
 		@param all: if not 0 export all particles (uninitialized (unborn or died)particles exported as None).
 		@type id: int
 		@param id: add the particle id in the end of the vector tuple
-		@rtype: list of vectors (tuple of 3 floats and optionnaly the id) or list of list of vectors
-		@return: list of vectors or list of list of vectors (hair mode)
+		@rtype: list of vectors (tuple of 3 floats and optionally the id) or list of list of vectors
+		@return: list of vectors or list of list of vectors (hair mode) or None if system is disabled
 		"""
 	def getRot(all=0,id=0):
 		"""
-		Get the particles rotations as quaternion.
+		Get the particles' rotations as quaternion.
 		A list of tuple is returned in particle mode.
-		The tuple is a vector list of 4 or 5 floats (x,y,z,w, optionnaly the id of the particle).
+		The tuple is vector of 4 or 5 floats (x,y,z,w, optionally the id of the particle).
 		
 		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
+		@param all: if not 0, export all particles (uninitialized (unborn or died) particles exported as None).
 		@type id: int
 		@param id: add the particle id in the return tuple
 		@rtype: list of tuple of 4 or 5 elements (if id is not zero)
-		@return: list of 4-tuples
+		@return: list of 4-tuples or None if system is disabled
 		"""
 		
 	def getMat():
 		"""
-		Get the particles material.
+		Get the particles' material.
 		@rtype: Blender Material
-		@return: The marterial assigned to particles
+		@return: The material assigned to particles
 		"""
 		
 	def getSize(all=0,id=0):
 		"""
-		Get the particles size.
+		Get the particles' size.
 		A list of float or list of tuple (particle's size,particle's id).
 		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
+		@param all: if not 0, export all particles (uninitialized (unborn or died) particles exported as None).
 		@type id: int
 		@param id: add the particle id in the return tuple
 		@rtype: list of floats
-		@return: list of floats or list of tuples if id is not zero (size,id).
+		@return: list of floats or list of tuples if id is not zero (size,id) or None if system is disabled.
 		"""
 		
 	def getAge(all=0,id=0):
 		"""
-		Get the particles age.
-		A list of float or list of tuple (particle's age,particle's id).
+		Get the particles' age.
+		A list of float or list of tuple (particle's age, particle's id).
 		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
+		@param all: if not 0, export all particles (uninitialized (unborn or died) particles exported as None).
 		@type id: int
 		@param id: add the particle id in the return tuple
 		@rtype: list of floats
-		@return: list of floats or list of tuples if id is not zero (size,id).
-		"""
-# Blender.Object module and the Object PyType object
-
-"""
-The Blender.Particle submodule
-
-
-Particle
-========
-
-This module provides access to the B{Particle} in Blender.
-
-@type TYPE: readonly dictionary
-@var TYPE: Constant dict used for with L{Particle.TYPE}
-		- HAIR: set particle system to hair mode.
-		- REACTOR: set particle system to reactor mode.
-		- EMITTER: set particle system to emitter mode.
-@type DISTRIBUTION: readonly dictionary
-@var DISTRIBUTION: Constant dict used for with L{Particle.DISTRIBUTION}
-		- GRID: set grid distribution.
-		- RANDOM: set random distribution.
-		- JITTERED: set jittered distribution.
-@type EMITFROM: readonly dictionary
-@var EMITFROM: Constant dict used for with L{Particle.EMITFROM}
-		- VERTS: set particles emit from vertices
-		- FACES: set particles emit from faces
-		- VOLUME: set particles emit from volume
-		- PARTICLE: set particles emit from particles
-@type REACTON: readonly dictionary
-@var REACTON: Constant dict used for with L{Particle.REACTON}
-		- NEAR: react on near
-		- COLLISION: react on collision
-		- DEATH: react on death
-@type DRAWAS: readonly dictionary
-@var DRAWAS: Constant dict used for with L{Particle.DRAWAS}
-		- NONE: Don't draw
-		- POINT: Draw as point
-		- CIRCLE: Draw as circles
-		- CROSS: Draw as crosses
-		- AXIS: Draw as axis
-		- LINE: Draw as lines
-		- PATH: Draw pathes
-		- OBJECT: Draw object
-		- GROUP: Draw goup
-		- BILLBOARD: Draw as billboard 
-"""
-
-def Get(name):
-		"""
-		Get the particle system of the object "name".
-		@type name: string
-		@return: The particle system of the object.
-		"""
-def New(name):
-		"""
-		Assign a new particle system to the object "name".
-		@type name: string
-		@return: The newly created particle system.
-		"""
-
-class Particle:
-	"""
-	The Particle object
-	===================
-		This object gives access to paticles data.
-		
-	@ivar seed: Set an offset in the random table.
-	@type seed: int
-	@ivar type: Type of particle system ( Particle.TYPE[ 'HAIR' | 'REACTOR' | 'EMITTER' ] ).
-	@type type: int
-	@ivar resolutionGrid: The resolution of the particle grid.
-	@type resolutionGrid: int
-	@ivar startFrame: Frame # to start emitting particles.
-	@type startFrame: float
-	@ivar endFrame: Frame # to stop emitting particles.
-	@type endFrame: float
-	@ivar editable: Finalize hair to enable editing in particle mode.
-	@type editable: int
-	@ivar amount: The total number of particles.
-	@type amount: int
-	@ivar multireact: React multiple times ( Paricle.REACTON[ 'NEAR' | 'COLLISION' | 'DEATH' ] ).
-	@type multireact: int
-	@ivar reactshape: Power of reaction strength dependence on distance to target.
-	@type reactshape: float
-	@ivar hairSegments: Amount of hair segments.
-	@type hairSegments: int
-	@ivar lifetime: Specify the life span of the particles.
-	@type lifetime: float
-	@ivar randlife: Give the particle life a random variation.
-	@type randlife: float
-	@ivar randemission: Give the particle life a random variation
-	@type randemission: int
-	@ivar particleDistribution: Where to emit particles from  Paricle.EMITFROM[ 'PARTICLE' | 'VOLUME' | 'FACES' | 'VERTS' ] )
-	@type particleDistribution: int
-	@ivar evenDistribution: Use even distribution from faces based on face areas or edge lengths.
-	@type evenDistribution: int
-	@ivar distribution: How to distribute particles on selected element Paricle.DISTRIBUTION[ 'GRID' | 'RANDOM' | 'JITTERED' ] ).
-	@type distribution: int
-	@ivar jitterAmount: Amount of jitter applied to the sampling.
-	@type jitterAmount: float
-	@ivar pf: Emission locations / face (0 = automatic).
-	@type pf:int
-	@ivar invert: Invert what is considered object and what is not.
-	@type invert: int
-	@ivar targetObject: The object that has the target particle system (empty if same object).
-	@type targetObject: Blender object
-	@ivar targetpsys: The target particle system number in the object.
-	@type targetpsys: int
-	@ivar 2d: Constrain boids to a surface.
-	@type 2d: float
-	@ivar maxvel: Maximum velocity.
-	@type maxvel: float
-	@ivar avvel: The usual speed % of max velocity.
-	@type avvel: float
-	@ivar latacc: Lateral acceleration % of max velocity
-	@type latacc: float
-	@ivar tanacc: Tangential acceleration % of max velocity
-	@type tanacc: float
-	@ivar groundz: Default Z value.
-	@type groundz: float
-	@ivar object: Constrain boids to object's surface.
-	@type object: Blender Object
-	@ivar renderEmitter: Render emitter object.
-	@type renderEmitter: int
-	@ivar displayPercentage: Particle display percentage.
-	@type displayPercentage: int
-	@ivar hairDisplayStep: How many steps paths are drawn with (power of 2) in visu mode.
-	@type hairDisplayStep: int
-	@ivar hairRenderStep: How many steps paths are rendered with (power of 2) in render mode."
-	@type hairRenderStep: int
-	@ivar duplicateObject: Get the duplicate object.
-	@type duplicateObject: Blender Object
-	@ivar drawAs: Get draw type Particle.DRAWAS([ 'NONE' | 'OBJECT' | 'POINT' | ... ]).
-	@type drawAs: int
-	"""
-	def freeEdit():
-		"""
-		Free edit mode.
-		@return: None
-		"""
-
-	def getLoc(all=0,id=0):
-		"""
-		Get the particles locations.
-		A list of tuple is returned in particle mode.
-		A list of list of tuple is returned in hair mode.
-		The tuple is a vector list of 3 floats in world space.
-		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died)particles exported as None).
-		@type id: int
-		@param id: add the particle id in the end of the vector tuple
-		@rtype: list of vectors (tuple of 3 floats and optionnaly the id) or list of list of vectors
-		@return: list of vectors or list of list of vectors (hair mode)
-		"""
-	def getRot(all=0,id=0):
-		"""
-		Get the particles rotations as quaternion.
-		A list of tuple is returned in particle mode.
-		The tuple is a vector list of 4 floats (quaternion).
-		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
-		@type id: int
-		@param id: add the particle id in the return tuple
-		@rtype: list of tuple of 4 or 5 elements (if id is not zero)
-		@return: list of 4-tuples
-		"""
-	def getMat():
-		"""
-		Get the particles material.
-		@rtype: Blender Material
-		@return: The marterial assigned to particles
-		"""
-	def getSize(all=0,id=0):
-		"""
-		Get the particles size.
-		A list of float.
-		@type all: int
-		@param all: if not 0 export all particles (uninitialized (unborn or died) particles exported as None).
-		@type id: int
-		@param id: add the particle id in the return tuple
-		@rtype: list of floats
-		@return: list of floats or list of tuples if id is not zero (size,id).
+		@return: list of floats or list of tuples if id is not zero (size,id) or None if system is disabled.
 		"""
diff --git a/source/blender/python/api2_2x/doc/Render.py b/source/blender/python/api2_2x/doc/Render.py
index 475a4fc5b10..d4dc83e84a0 100644
--- a/source/blender/python/api2_2x/doc/Render.py
+++ b/source/blender/python/api2_2x/doc/Render.py
@@ -833,9 +833,7 @@ class RenderData:
 
   def enableCropping(toggle):
     """
-    Enable/disable exclusion of border rendering from total image.
-    @type toggle: int
-    @param toggle: pass 1 for on / 0 for off
+    Deprecated: see the L{crop} attribute.
     """
 
   def setImageType(type):