Revision: 20471
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20471
Author: campbellbarton
Date: 2009-05-28 09:11:12 +0200 (Thu, 28 May 2009)
Log Message:
-----------
renamed python 'bookmark' attribute to 'useHighPriority', was renamed in the UI
but not in python.
Modified Paths:
--------------
trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
trunk/blender/source/gameengine/PyDoc/GameTypes.py
Modified: trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
2009-05-28 06:34:56 UTC (rev 20470)
+++ trunk/blender/source/gameengine/GameLogic/SCA_IController.cpp
2009-05-28 07:11:12 UTC (rev 20471)
@@ -244,7 +244,7 @@
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
};
Modified: trunk/blender/source/gameengine/PyDoc/GameTypes.py
===================================================================
--- trunk/blender/source/gameengine/PyDoc/GameTypes.py 2009-05-28 06:34:56 UTC
(rev 20470)
+++ trunk/blender/source/gameengine/PyDoc/GameTypes.py 2009-05-28 07:11:12 UTC
(rev 20471)
@@ -258,10 +258,9 @@
- 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 @@
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.
"""
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
