Tamito Kajiyama 53840c7db5 Merged changes in the trunk up to revision 52546. ...

Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c

2012-11-26 02:32:34 +00:00

..

blender

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

blenderplayer

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

creator

Merged changes in the trunk up to revision 52546.

2012-11-26 02:32:34 +00:00

gameengine

BGE: The blenderplayer usage docs mentioned "enable all frames" was "fixedtime," but the player was actually looking for "fixed_framerate." Since fixedtime doesn't have a fixed framerate, but a fixed time step, I change the player to look for the documented flag, "fixedtime," which makes more sense.

2012-11-25 07:42:41 +00:00

icons

…

tests

add missing bgl and gpu api docstrings (found using docstring completeness checker)

2012-11-22 05:15:52 +00:00

CMakeLists.txt

…

SConscript

…