removed ED_ prefix from script operator.

python operator api was crashing when unknown operators were called.

2 files changed, 9 insertions, 11 deletions

diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index 966253f82a8..4ed48dd81dd 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -77,10 +77,11 @@ static PyObject *pyop_base_getattro( BPy_OperatorBase * self, PyObject *pyname )
 		ot = WM_operatortype_find(name);
 
 		if (ot) {
-			return pyop_func_CreatePyObject(self->C, name);
+			ret= pyop_func_CreatePyObject(self->C, name);
 		}
 		else {
 			PyErr_Format( PyExc_AttributeError, "Operator \"%s\" not found", name);
+			ret= NULL;
 		}
 	}
 	
@@ -101,18 +102,17 @@ static PyObject * pyop_func_call(BPy_OperatorFunc * self, PyObject *args, PyObje
 	PropertyRNA *prop, *iterprop;
 	CollectionPropertyIterator iter;
 
-
-	if (ot == NULL) {
-		PyErr_SetString( PyExc_SystemError, "Operator could not be found");
-		return NULL;
-	}
-
 	if (PyTuple_Size(args)) {
 		PyErr_SetString( PyExc_AttributeError, "All operator args must be keywords");
 		return NULL;
 	}
 
 	ot= WM_operatortype_find(self->name);
+	if (ot == NULL) {
+		PyErr_SetString( PyExc_SystemError, "Operator could not be found");
+		return NULL;
+	}
+	
 	RNA_pointer_create(NULL, NULL, ot->srna, &properties, &ptr);
 
 
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 0b33f11d74d..f38d8a46573 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -70,10 +70,8 @@ static char *pyrna_enum_as_string(PointerRNA *ptr, PropertyRNA *prop)
 	RNA_property_enum_items(ptr, prop, &item, &totitem);
 
 	for (i=0; i<totitem; i++) {
-		if (i<totitem-1)
-			BLI_dynstr_appendf(dynstr, "'%s', ", item[i].identifier);
-		else
-			BLI_dynstr_appendf(dynstr, "'%s'", item[i].identifier);
+		
+		BLI_dynstr_appendf(dynstr, i?", '%s'":"'%s'", item[i].identifier);
 	}
 	
 	cstring = BLI_dynstr_get_cstring(dynstr);