[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52458] trunk/blender: bge camera axix actuator was undocumented and python had incorrect limits on this attribute .

[Campbell Barton]

Revision: 52458
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52458
Author:   campbellbarton
Date:     2012-11-22 05:33:05 +0000 (Thu, 22 Nov 2012)
Log Message:
-----------
bge camera axix actuator was undocumented and python had incorrect limits on this attribute.

Modified Paths:
--------------
    trunk/blender/doc/python_api/rst/bge.types.rst
    trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp

Modified: trunk/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.types.rst	2012-11-22 05:20:51 UTC (rev 52457)
+++ trunk/blender/doc/python_api/rst/bge.types.rst	2012-11-22 05:33:05 UTC (rev 52458)
@@ -205,6 +205,18 @@
       
       :type: boolean
 
+   .. attribute:: pos_ticks
+
+      The number of ticks since the last positive pulse (read-only).
+      
+      :type: int
+
+   .. attribute:: neg_ticks
+
+      The number of ticks since the last negative pulse (read-only).
+      
+      :type: int
+
    .. attribute:: status
 
       The status of the sensor (read-only): can be one of :ref:`these constants<sensor-status>`.
@@ -743,7 +755,13 @@
       strength of of the camera following movement.
 
       :type: float
-   
+
+   .. attribute:: axis
+
+      The camera axis (0, 1, 2) for positive ``XYZ``, (3, 4, 5) for negative ``XYZ``.
+
+      :type: int
+
    .. attribute:: min
 
       minimum distance to the target object maintained by the actuator.

Modified: trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp	2012-11-22 05:20:51 UTC (rev 52457)
+++ trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp	2012-11-22 05:33:05 UTC (rev 52458)
@@ -388,8 +388,8 @@
 	KX_PYATTRIBUTE_FLOAT_RW("min",-FLT_MAX,FLT_MAX,KX_CameraActuator,m_minHeight),
 	KX_PYATTRIBUTE_FLOAT_RW("max",-FLT_MAX,FLT_MAX,KX_CameraActuator,m_maxHeight),
 	KX_PYATTRIBUTE_FLOAT_RW("height",-FLT_MAX,FLT_MAX,KX_CameraActuator,m_height),
-	KX_PYATTRIBUTE_SHORT_RW("axis", 0, 3, true, KX_CameraActuator,m_axis),
-	KX_PYATTRIBUTE_RW_FUNCTION("object", KX_CameraActuator, pyattr_get_object,	pyattr_set_object),
+	KX_PYATTRIBUTE_SHORT_RW("axis", 0, 5, true, KX_CameraActuator, m_axis),
+	KX_PYATTRIBUTE_RW_FUNCTION("object", KX_CameraActuator, pyattr_get_object, pyattr_set_object),
 	KX_PYATTRIBUTE_FLOAT_RW("damping",0.f,10.f,KX_CameraActuator,m_damping),
 	{NULL}
 };