From b9d8a2716ae1fb85f2497352566b51b6073e038d Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 May 2009 07:11:12 +0000 Subject: [PATCH] renamed python 'bookmark' attribute to 'useHighPriority', was renamed in the UI but not in python. --- source/gameengine/GameLogic/SCA_IController.cpp | 2 +- source/gameengine/PyDoc/GameTypes.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp index 84a6bfb8085..f2c3c83a2d9 100644 --- a/source/gameengine/GameLogic/SCA_IController.cpp +++ b/source/gameengine/GameLogic/SCA_IController.cpp @@ -244,7 +244,7 @@ PyAttributeDef SCA_IController::Attributes[] = { KX_PYATTRIBUTE_RO_FUNCTION("state", SCA_IController, pyattr_get_state), KX_PYATTRIBUTE_RO_FUNCTION("sensors", SCA_IController, pyattr_get_sensors), KX_PYATTRIBUTE_RO_FUNCTION("actuators", SCA_IController, pyattr_get_actuators), - KX_PYATTRIBUTE_BOOL_RW("bookmark",SCA_IController,m_bookmark), + KX_PYATTRIBUTE_BOOL_RW("useHighPriority",SCA_IController,m_bookmark), { NULL } //Sentinel }; diff --git a/source/gameengine/PyDoc/GameTypes.py b/source/gameengine/PyDoc/GameTypes.py index d951ec0c954..4f176c17af2 100644 --- a/source/gameengine/PyDoc/GameTypes.py +++ b/source/gameengine/PyDoc/GameTypes.py @@ -258,10 +258,9 @@ class SCA_IController(SCA_ILogicBrick): - note: the sensors are not necessarily owned by the same object. - note: when objects are instanced in dupligroups links may be lost from objects outside the dupligroup. @type actuators: sequence supporting index/string lookups and iteration. - @ivar bookmark: the bookmark option. - If set, the controller executes always before all other non-bookmarked controllers. - note: Order of execution between bookmarked controllers is not guaranteed. - @type bookmark: bool + @ivar useHighPriority: When set the controller executes always before all other controllers that dont have this set. + note: Order of execution between high priority controllers is not guaranteed. + @type useHighPriority: bool """ #{ Deprecated def getState(): @@ -2385,7 +2384,7 @@ class KX_MeshProxy(SCA_IObject): and have all collision primitives in one vertex array (ie. < 65535 verts) and be either a polytope or polyheder mesh. If you don't get a warning in the console when the collision type is polytope, the mesh is suitable for reinstance. - + @bug: This currently does not work. @rtype: boolean @return: True if reinstance succeeded, False if it failed. """