Merging r48308 through r48313 from trunk into soc-2011-tomato

source/blender/compositor/operations/COM_KeyingScreenOperation.cpp

@@ -218,9 +218,13 @@ void *KeyingScreenOperation::initializeTileData(rcti *rect, MemoryBuffer **memor
 		unlockMutex();
 	}
 
+	triangulation = this->m_cachedTriangulation;
+
+	if (!triangulation)
+		return NULL;
+
 	BLI_init_rctf(&rect_float, rect->xmin, rect->xmax, rect->ymin, rect->ymax);
 
-	triangulation = this->m_cachedTriangulation;
 	tile_data = (TileData *) MEM_callocN(sizeof(TileData), "keying screen tile data");
 
 	for (i = 0; i < triangulation->triangles_total; i++) {

source/blender/editors/curve/editcurve.c

@@ -1199,8 +1199,6 @@ void load_editNurb(Object *obedit)
 
 	if (obedit == NULL) return;
 
-	set_actNurb(obedit, NULL);
-
 	if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
 		Curve *cu = obedit->data;
 		Nurb *nu, *newnu;
@@ -1222,8 +1220,6 @@ void load_editNurb(Object *obedit)
 
 		BKE_nurbList_free(&oldnurb);
 	}
-
-	set_actNurb(obedit, NULL);
 }
 
 /* make copy in cu->editnurb */
@@ -1234,7 +1230,6 @@ void make_editNurb(Object *obedit)
 	Nurb *nu, *newnu, *nu_act = NULL;
 	KeyBlock *actkey;
 
-
 	set_actNurb(obedit, NULL);
 
 	if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {

source/blender/python/mathutils/mathutils_Vector.c

@@ -54,11 +54,18 @@ static int row_vector_multiplication(float rvec[MAX_DIMENSIONS], VectorObject *v
 /* Supports 2D, 3D, and 4D vector objects both int and float values
  * accepted. Mixed float and int values accepted. Ints are parsed to float
  */
-static PyObject *Vector_new(PyTypeObject *type, PyObject *args, PyObject *UNUSED(kwds))
+static PyObject *Vector_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 {
 	float *vec = NULL;
 	int size = 3; /* default to a 3D vector */
 
+	if (kwds && PyDict_Size(kwds)) {
+		PyErr_SetString(PyExc_TypeError,
+		                "Vector(): "
+		                "takes no keyword args");
+		return NULL;
+	}
+
 	switch (PyTuple_GET_SIZE(args)) {
 		case 0:
 			vec = PyMem_Malloc(size * sizeof(float));