2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

Notes:
* Sequence transform strip uses G.scene global, this is commented
  out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
  2.5 got merged, but no new files were added. Calls to these files
  are commented out with "XXX etch-a-ton". editarmature.c and
  transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
  (player still fails to link).

1 files changed, 19 insertions, 9 deletions

diff --git a/source/gameengine/Ketsji/KX_RadarSensor.h b/source/gameengine/Ketsji/KX_RadarSensor.h
index 7272b219e37..6dfe0c42f5d 100644
--- a/source/gameengine/Ketsji/KX_RadarSensor.h
+++ b/source/gameengine/Ketsji/KX_RadarSensor.h
@@ -40,23 +40,23 @@ class KX_RadarSensor : public KX_NearSensor
  protected:
 	Py_Header;
 		
-	MT_Scalar		m_coneradius;
+	float		m_coneradius;
 
 	/**
 	 * Height of the cone.
 	 */
-	MT_Scalar		m_coneheight;
+	float		m_coneheight;
 	int				m_axis;
 
 	/**
 	 * The previous position of the origin of the cone.
 	 */
-	MT_Point3       m_cone_origin;
+	float       m_cone_origin[3];
 
 	/**
 	 * The previous direction of the cone (origin to bottom plane).
 	 */
-	MT_Point3       m_cone_target;
+	float       m_cone_target[3];
 	
 public:
 
@@ -80,13 +80,23 @@ public:
 	/* --------------------------------------------------------------------- */
 	/* Python interface ---------------------------------------------------- */
 	/* --------------------------------------------------------------------- */
-	
-	virtual PyObject* _getattr(const STR_String& attr);
+	enum RadarAxis {
+		KX_RADAR_AXIS_POS_X = 0,
+		KX_RADAR_AXIS_POS_Y,
+		KX_RADAR_AXIS_POS_Z,
+		KX_RADAR_AXIS_NEG_X,
+		KX_RADAR_AXIS_NEG_Y,
+		KX_RADAR_AXIS_NEG_Z
+	};
 
-	KX_PYMETHOD_DOC(KX_RadarSensor,GetConeOrigin);
-	KX_PYMETHOD_DOC(KX_RadarSensor,GetConeTarget);
-	KX_PYMETHOD_DOC(KX_RadarSensor,GetConeHeight);
+	virtual PyObject* _getattr(const char *attr);
+	virtual int _setattr(const char *attr, PyObject* value);
 
+	//Deprecated ----->
+	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeOrigin);
+	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeTarget);
+	KX_PYMETHOD_DOC_NOARGS(KX_RadarSensor,GetConeHeight);
+	//<-----
 };
 
 #endif //__KX_RADAR_SENSOR_H