Scene.c - world could not be set to None, added "cursor" attribute.

Scene.py - added docs for new scen attributes.
meshtools.c - typo

1 files changed, 41 insertions, 3 deletions

diff --git a/source/blender/python/api2_2x/Scene.c b/source/blender/python/api2_2x/Scene.c
index ce9bcb08f61..a0e83635825 100644
--- a/source/blender/python/api2_2x/Scene.c
+++ b/source/blender/python/api2_2x/Scene.c
@@ -78,6 +78,8 @@ struct View3D;
 #include "sceneRadio.h"
 #include "sceneTimeLine.h"
 
+#include "BKE_utildefines.h" /* vec copy */
+#include "vector.h"
 
 PyObject *M_Object_Get( PyObject * self, PyObject * args ); /* from Object.c */
 
@@ -367,15 +369,21 @@ static int Scene_setWorld( BPy_Scene * self, PyObject * value )
 	
 	SCENE_DEL_CHECK_INT(self);
 	
-	if (!BPy_World_Check(value))
+	/* accepts a World or None */
+	if (BPy_World_Check(value)) {
+		world = World_FromPyObject(value);
+	} else if (value != Py_None) {
 		return ( EXPP_ReturnIntError( PyExc_TypeError,
 			"expected a world object" ) );
+	}
 	
-	world = World_FromPyObject(value);
 	/* If there is a world then it now has one less user */
 	if( self->scene->world )
 		self->scene->world->id.us--;
-	world->id.us++;
+	
+	if (world)
+		world->id.us++;
+	
 	G.scene->world = world;
 	return 0;
 }
@@ -387,6 +395,32 @@ static PyObject *Scene_getObjects( BPy_Scene *self)
 	return SceneObSeq_CreatePyObject(self, NULL, 0);
 }
 
+
+
+static PyObject *Scene_getCursor( BPy_Scene * self )
+{
+	SCENE_DEL_CHECK_PY(self);
+	return newVectorObject( self->scene->cursor, 3, Py_WRAP );
+}
+
+static int Scene_setCursor( BPy_Scene * self, PyObject * value )
+{	
+	VectorObject *bpy_vec;
+	SCENE_DEL_CHECK_INT(self);
+	if (!VectorObject_Check(value))
+		return ( EXPP_ReturnIntError( PyExc_TypeError,
+			"expected a vector" ) );
+	
+	bpy_vec = (VectorObject *)value;
+	
+	if (bpy_vec->size != 3)
+		return ( EXPP_ReturnIntError( PyExc_ValueError,
+			"can only assign a 3D vector" ) );
+	
+	VECCOPY(self->scene->cursor, bpy_vec->vec);
+	return 0;
+}
+
 /*****************************************************************************/
 /* Python attributes get/set structure:                                      */
 /*****************************************************************************/
@@ -404,6 +438,10 @@ static PyGetSetDef BPy_Scene_getseters[] = {
 	 (getter)Scene_getWorld, (setter)Scene_setWorld,
 	 "Scene layer bitmask",
 	 NULL},
+	{"cursor",
+	 (getter)Scene_getCursor, (setter)Scene_setCursor,
+	 "Scene layer bitmask",
+	 NULL},
 	{"timeline",
 	 (getter)Scene_getTimeLine, (setter)NULL,
 	 "Scenes timeline (read only)",