diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 09:04:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-11 09:04:01 +0400 |
| commit | ef18ec335ff8496d1a047615073c7258eeffa371 (patch) | |
| tree | 0da45af24c4b9f4055390a9640bf0d59613605bc /doc | |
| parent | 17e88915fdd7048365df1be48d615d69c0924b4c (diff) | |
| parent | 50277c48ba5bf9eae418453159e421489895dafd (diff) | |
svn merge -r39145:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doxygen/Doxyfile | 2 | ||||
| -rw-r--r-- | doc/python_api/rst/bge.logic.rst | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 79b3f1a4160..b4d3b14b9dd 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = Blender # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = "V2.58" +PROJECT_NUMBER = "V2.59" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/doc/python_api/rst/bge.logic.rst b/doc/python_api/rst/bge.logic.rst index 128f87f76bd..798491b4710 100644 --- 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) |