merged changes to revision 24077

source/blender/python/generic/matrix.c

@@ -165,6 +165,8 @@ static PyObject *Matrix_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
 				return NULL;
 
 			memcpy(matrix, mat->contigPtr, sizeof(float) * mat->rowSize * mat->colSize);
+			argSize = mat->rowSize;
+			seqSize = mat->colSize;
 		}
 	}else{ //2-4 arguments (all seqs? all same size?)
 		for(i =0; i < argSize; i++){

source/blender/python/generic/vector.c

@@ -1271,7 +1271,7 @@ static PyObject *Vector_getSwizzle(VectorObject * self, void *closure)
    unchanged. */
 static int Vector_setSwizzle(VectorObject * self, PyObject * value, void *closure)
 {
-	VectorObject *vecVal;
+	VectorObject *vecVal = NULL;
 	PyObject *item;
 	size_t listLen;
 	float scalarVal;

source/blender/python/intern/bpy_interface.c

@@ -887,7 +887,7 @@ float BPY_pydriver_eval (ChannelDriver *driver)
 int BPY_button_eval(bContext *C, char *expr, double *value)
 {
 	PyGILState_STATE gilstate;
-	PyObject *dict, *retval;
+	PyObject *dict, *mod, *retval;
 	int error_ret = 0;
 	
 	if (!value || !expr || expr[0]=='\0') return -1;
@@ -895,6 +895,20 @@ int BPY_button_eval(bContext *C, char *expr, double *value)
 	bpy_context_set(C, &gilstate);
 	
 	dict= CreateGlobalDictionary(C);
+	
+	/* import some modules: builtins,math*/
+	PyDict_SetItemString(dict, "__builtins__", PyEval_GetBuiltins());
+
+	mod = PyImport_ImportModule("math");
+	if (mod) {
+		PyDict_Merge(dict, PyModule_GetDict(mod), 0); /* 0 - dont overwrite existing values */
+		
+		/* Only keep for backwards compat! - just import all math into root, they are standard */
+		PyDict_SetItemString(dict, "math", mod);
+		PyDict_SetItemString(dict, "m", mod);
+		Py_DECREF(mod);
+	} 
+	
 	retval = PyRun_String(expr, Py_eval_input, dict, dict);
 	
 	if (retval == NULL) {

source/blender/python/intern/bpy_rna.c

@@ -1590,7 +1590,7 @@ static int foreach_compat_buffer(RawPropertyType raw_type, int attr_signed, cons
 
 static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set)
 {
-	PyObject *item;
+	PyObject *item = NULL;
 	int i=0, ok, buffer_is_compat;
 	void *array= NULL;
 
@@ -2677,7 +2677,7 @@ PyObject *BPY_rna_props( void )
 
 static StructRNA *pyrna_struct_as_srna(PyObject *self)
 {
-	BPy_StructRNA *py_srna;
+	BPy_StructRNA *py_srna = NULL;
 	StructRNA *srna;
 	
 	/* ack, PyObject_GetAttrString wont look up this types tp_dict first :/ */