archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

renamed python 'bookmark' attribute to 'useHighPriority', was renamed in the UI but not in python.

Browse Source
This commit is contained in:
Campbell Barton
2009-05-28 07:11:12 +00:00
parent ca5d429bf9
commit b9d8a2716a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/gameengine/GameLogic/SCA_IController.cpp
View File

@@ -244,7 +244,7 @@ PyAttributeDef SCA_IController::Attributes[] = {
KX_PYATTRIBUTE_RO_FUNCTION("state", SCA_IController, pyattr_get_state), KX_PYATTRIBUTE_RO_FUNCTION("state", SCA_IController, pyattr_get_state),
KX_PYATTRIBUTE_RO_FUNCTION("sensors", SCA_IController, pyattr_get_sensors), KX_PYATTRIBUTE_RO_FUNCTION("sensors", SCA_IController, pyattr_get_sensors),
KX_PYATTRIBUTE_RO_FUNCTION("actuators", SCA_IController, pyattr_get_actuators), 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 { NULL } //Sentinel
}; };

9
source/gameengine/PyDoc/GameTypes.py
View File

@@ -258,10 +258,9 @@ class SCA_IController(SCA_ILogicBrick):
- note: the sensors are not necessarily owned by the same object. - 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. - 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. @type actuators: sequence supporting index/string lookups and iteration.
@ivar bookmark: the bookmark option. @ivar useHighPriority: When set the controller executes always before all other controllers that dont have this set.
If set, the controller executes always before all other non-bookmarked controllers. note: Order of execution between high priority controllers is not guaranteed.
note: Order of execution between bookmarked controllers is not guaranteed. @type useHighPriority: bool
@type bookmark: bool
""" """
#{ Deprecated #{ Deprecated
def getState(): def getState():
@@ -2385,7 +2384,7 @@ class KX_MeshProxy(SCA_IObject):
and have all collision primitives in one vertex array (ie. < 65535 verts) and 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 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. console when the collision type is polytope, the mesh is suitable for reinstance.
@bug: This currently does not work.
@rtype: boolean @rtype: boolean
@return: True if reinstance succeeded, False if it failed. @return: True if reinstance succeeded, False if it failed.
""" """