Merged changes in the trunk up to revision 52118.

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
This commit is contained in:
2012-11-12 00:30:55 +00:00
285 changed files with 6523 additions and 2589 deletions

View File

@@ -1957,6 +1957,28 @@ Types
:return: a polygon object.
:rtype: :class:`PolyProxy`
.. method:: transform(matid, matrix)
Transforms the vertices of a mesh.
:arg matid: material index, -1 transforms all.
:type matid: integer
:arg matrix: transformation matrix.
:type matrix: 4x4 matrix [[float]]
.. method:: transform_uv(matid, matrix, uv_index=-1, uv_index_from=-1)
Transforms the vertices UV's of a mesh.
:arg matid: material index, -1 transforms all.
:type matid: integer
:arg matrix: transformation matrix.
:type matrix: 4x4 matrix [[float]]
:arg uv_index: optional uv index, -1 for all, otherwise 0 or 1.
:type uv_index: integer
:arg uv_index_from: optional uv index to copy from, -1 to transform the current uv.
:type uv_index_from: integer
.. class:: SCA_MouseSensor(SCA_ISensor)
Mouse Sensor logic brick.
@@ -3113,6 +3135,12 @@ Types
:type: list
.. attribute:: gravity
The scene gravity using the world x, y and z axis.
:type: list [fx, fy, fz]
.. method:: addObject(object, other, time=0)
Adds an object to the scene like the Add Object Actuator would.