Merged changes in the trunk up to revision 39368.

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
This commit is contained in:
2011-08-13 23:29:16 +00:00
198 changed files with 15111 additions and 13891 deletions

View File

@@ -217,6 +217,12 @@ General functions
Loads a scene into the game engine.
.. note::
This function is not effective immediately, the scene is queued
and added on the next logic cycle where it will be available
from `getSceneList`
:arg name: The name of the scene
:type name: string
:arg overlay: Overlay or underlay (optional)