svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-08-11 05:04:01 +00:00
parent 17e88915fd 50277c48ba
commit ef18ec335f
63 changed files with 6767 additions and 6743 deletions
--- a/doc/python_api/rst/bge.logic.rst
+++ b/doc/python_api/rst/bge.logic.rst
@@ -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)