archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merged changes in the trunk up to revision 48893.

Browse Source 
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h
This commit is contained in:
Tamito Kajiyama
2012-07-13 23:23:06 +00:00
parent b7b5029814 807ad1f0e0
commit 065605e0da
621 changed files with 11525 additions and 6470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/python_api/rst/bge.types.rst
View File

@@ -1335,18 +1335,10 @@ Game Types (bge.types)
Rigid body physics allows the object to roll on collisions.
.. note::
This is not working with bullet physics yet.
.. method:: disableRigidBody()
Disables rigid body physics for this object.
.. note::
This is not working with bullet physics yet. The angular is removed but rigid body physics can still rotate it later.
.. method:: setParent(parent, compound=True, ghost=True)
Sets this object's parent.
@@ -4222,6 +4214,10 @@ Game Types (bge.types)
.. attribute:: projection_matrix
This camera's 4x4 projection matrix.
.. note::
This is the identity matrix prior to rendering the first frame (any Python done on frame 1).
:type: 4x4 Matrix [[float]]
@@ -4233,7 +4229,7 @@ Game Types (bge.types)
.. note::
This matrix is regenerated every frame from the camera's position and orientation.
This matrix is regenerated every frame from the camera's position and orientation. Also, this is the identity matrix prior to rendering the first frame (any Python done on frame 1).
.. attribute:: camera_to_world