Merge from trunk

svn merge -r 15104:15202 https://svn.blender.org/svnroot/bf-blender/trunk/blender
This commit is contained in:
Andre Susano Pinto
2008-06-11 22:53:52 +00:00
parent b5432c6780
commit 39d35edbe6
59 changed files with 3998 additions and 3031 deletions

View File

@@ -389,6 +389,8 @@ class Object:
@ivar parentbonename: The string name of the parent bone (if defined).
This can be set to another bone in the armature if the object already has a bone parent.
@type parentbonename: string or None
@ivar parentVertexIndex: A list of vertex parent indicies, with a length of 0, 1 or 3. When there are 1 or 3 vertex parents, the indicies can be assigned to a sequence of the same length.
@type parentVertexIndex: list
@ivar protectFlags: The "transform locking" bitfield flags for the object.
See L{ProtectFlags} const dict for values.
@type protectFlags: int