formatting edits only to use more consisted style

1 files changed, 75 insertions, 75 deletions

diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index 70346a65bf9..6a6e6595ed4 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -66,18 +66,18 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 {
 	wmOperatorType *ot;
 	char		*opname;
-	PyObject	*context_dict= NULL; /* optional args */
+	PyObject	*context_dict = NULL; /* optional args */
 	PyObject	*context_dict_back;
-	char		*context_str= NULL;
+	char		*context_str = NULL;
 	PyObject	*ret;
 
-	int context= WM_OP_EXEC_DEFAULT;
+	int context = WM_OP_EXEC_DEFAULT;
 
 	/* XXX Todo, work out a better solution for passing on context,
 	 * could make a tuple from self and pack the name and Context into it... */
-	bContext *C= (bContext *)BPy_GetContext();
+	bContext *C = (bContext *)BPy_GetContext();
 	
-	if (C==NULL) {
+	if (C == NULL) {
 		PyErr_SetString(PyExc_RuntimeError, "Context is None, cant poll any operators");
 		return NULL;
 	}
@@ -85,7 +85,7 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 	if (!PyArg_ParseTuple(args, "s|Os:_bpy.ops.poll", &opname, &context_dict, &context_str))
 		return NULL;
 	
-	ot= WM_operatortype_find(opname, TRUE);
+	ot = WM_operatortype_find(opname, TRUE);
 
 	if (ot == NULL) {
 		PyErr_Format(PyExc_AttributeError,
@@ -95,8 +95,8 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 	}
 
 	if (context_str) {
-		if (RNA_enum_value_from_id(operator_context_items, context_str, &context)==0) {
-			char *enum_str= BPy_enum_as_string(operator_context_items);
+		if (RNA_enum_value_from_id(operator_context_items, context_str, &context) == 0) {
+			char *enum_str = BPy_enum_as_string(operator_context_items);
 			PyErr_Format(PyExc_TypeError,
 			             "Calling operator \"bpy.ops.%s.poll\" error, "
 			             "expected a string enum in (%.200s)",
@@ -106,8 +106,8 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 		}
 	}
 	
-	if (context_dict==NULL || context_dict==Py_None) {
-		context_dict= NULL;
+	if (context_dict == NULL || context_dict == Py_None) {
+		context_dict = NULL;
 	}
 	else if (!PyDict_Check(context_dict)) {
 		PyErr_Format(PyExc_TypeError,
@@ -117,12 +117,12 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 		return NULL;
 	}
 
-	context_dict_back= CTX_py_dict_get(C);
+	context_dict_back = CTX_py_dict_get(C);
 	CTX_py_dict_set(C, (void *)context_dict);
 	Py_XINCREF(context_dict); /* so we done loose it */
 	
 	/* main purpose of thsi function */
-	ret= WM_operator_poll_context((bContext*)C, ot, context) ? Py_True : Py_False;
+	ret = WM_operator_poll_context((bContext *)C, ot, context) ? Py_True : Py_False;
 	
 	/* restore with original context dict, probably NULL but need this for nested operator calls */
 	Py_XDECREF(context_dict);
@@ -135,24 +135,24 @@ static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 {
 	wmOperatorType *ot;
-	int error_val= 0;
+	int error_val = 0;
 	PointerRNA ptr;
-	int operator_ret= OPERATOR_CANCELLED;
+	int operator_ret = OPERATOR_CANCELLED;
 
 	char		*opname;
-	char		*context_str= NULL;
-	PyObject	*kw= NULL; /* optional args */
-	PyObject	*context_dict= NULL; /* optional args */
+	char		*context_str = NULL;
+	PyObject	*kw = NULL; /* optional args */
+	PyObject	*context_dict = NULL; /* optional args */
 	PyObject	*context_dict_back;
 
 	/* note that context is an int, python does the conversion in this case */
-	int context= WM_OP_EXEC_DEFAULT;
+	int context = WM_OP_EXEC_DEFAULT;
 
 	/* XXX Todo, work out a better solution for passing on context,
 	 * could make a tuple from self and pack the name and Context into it... */
-	bContext *C= (bContext *)BPy_GetContext();
+	bContext *C = (bContext *)BPy_GetContext();
 	
-	if (C==NULL) {
+	if (C == NULL) {
 		PyErr_SetString(PyExc_RuntimeError, "Context is None, cant poll any operators");
 		return NULL;
 	}
@@ -160,7 +160,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 	if (!PyArg_ParseTuple(args, "sO|O!s:_bpy.ops.call", &opname, &context_dict, &PyDict_Type, &kw, &context_str))
 		return NULL;
 
-	ot= WM_operatortype_find(opname, TRUE);
+	ot = WM_operatortype_find(opname, TRUE);
 
 	if (ot == NULL) {
 		PyErr_Format(PyExc_AttributeError,
@@ -178,8 +178,8 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 	}
 
 	if (context_str) {
-		if (RNA_enum_value_from_id(operator_context_items, context_str, &context)==0) {
-			char *enum_str= BPy_enum_as_string(operator_context_items);
+		if (RNA_enum_value_from_id(operator_context_items, context_str, &context) == 0) {
+			char *enum_str = BPy_enum_as_string(operator_context_items);
 			PyErr_Format(PyExc_TypeError,
 			             "Calling operator \"bpy.ops.%s\" error, "
 			             "expected a string enum in (%.200s)",
@@ -189,8 +189,8 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 		}
 	}
 
-	if (context_dict==NULL || context_dict==Py_None) {
-		context_dict= NULL;
+	if (context_dict == NULL || context_dict == Py_None) {
+		context_dict = NULL;
 	}
 	else if (!PyDict_Check(context_dict)) {
 		PyErr_Format(PyExc_TypeError,
@@ -200,31 +200,31 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 		return NULL;
 	}
 
-	context_dict_back= CTX_py_dict_get(C);
+	context_dict_back = CTX_py_dict_get(C);
 
 	CTX_py_dict_set(C, (void *)context_dict);
 	Py_XINCREF(context_dict); /* so we done loose it */
 
-	if (WM_operator_poll_context((bContext*)C, ot, context) == FALSE) {
-		const char *msg= CTX_wm_operator_poll_msg_get(C);
+	if (WM_operator_poll_context((bContext *)C, ot, context) == FALSE) {
+		const char *msg = CTX_wm_operator_poll_msg_get(C);
 		PyErr_Format(PyExc_RuntimeError,
 		             "Operator bpy.ops.%.200s.poll() %.200s",
 		             opname, msg ? msg : "failed, context is incorrect");
 		CTX_wm_operator_poll_msg_set(C, NULL); /* better set to NULL else it could be used again */
-		error_val= -1;
+		error_val = -1;
 	}
 	else {
 		WM_operator_properties_create_ptr(&ptr, ot);
 		WM_operator_properties_sanitize(&ptr, 0);
 
 		if (kw && PyDict_Size(kw))
-			error_val= pyrna_pydict_to_props(&ptr, kw, 0, "Converting py args to operator properties: ");
+			error_val = pyrna_pydict_to_props(&ptr, kw, 0, "Converting py args to operator properties: ");
 
 
-		if (error_val==0) {
+		if (error_val == 0) {
 			ReportList *reports;
 
-			reports= MEM_mallocN(sizeof(ReportList), "wmOperatorReportList");
+			reports = MEM_mallocN(sizeof(ReportList), "wmOperatorReportList");
 			BKE_reports_init(reports, RPT_STORE | RPT_OP_HOLD); /* own so these dont move into global reports */
 
 #ifdef BPY_RELEASE_GIL
@@ -233,10 +233,10 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 			/* note: I havve not seen any examples of code that does this
 			 * so it may not be officially supported but seems to work ok. */
 			{
-				PyThreadState *ts= PyEval_SaveThread();
+				PyThreadState *ts = PyEval_SaveThread();
 #endif
 
-				operator_ret= WM_operator_call_py(C, ot, context, &ptr, reports);
+				operator_ret = WM_operator_call_py(C, ot, context, &ptr, reports);
 
 #ifdef BPY_RELEASE_GIL
 				/* regain GIL */
@@ -244,11 +244,11 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 			}
 #endif
 
-			error_val= BPy_reports_to_error(reports, PyExc_RuntimeError, FALSE);
+			error_val = BPy_reports_to_error(reports, PyExc_RuntimeError, FALSE);
 
 			/* operator output is nice to have in the terminal/console too */
 			if (reports->list.first) {
-				char *report_str= BKE_reports_string(reports, 0); /* all reports */
+				char *report_str = BKE_reports_string(reports, 0); /* all reports */
 	
 				if (report_str) {
 					PySys_WriteStdout("%s\n", report_str);
@@ -285,7 +285,7 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 	Py_XDECREF(context_dict);
 	CTX_py_dict_set(C, (void *)context_dict_back);
 
-	if (error_val==-1) {
+	if (error_val == -1) {
 		return NULL;
 	}
 
@@ -308,16 +308,16 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
 	PointerRNA ptr;
 
 	char		*opname;
-	PyObject	*kw= NULL; /* optional args */
-	int all_args= 1;
-	int error_val= 0;
+	PyObject	*kw = NULL; /* optional args */
+	int all_args = 1;
+	int error_val = 0;
 
-	char *buf= NULL;
+	char *buf = NULL;
 	PyObject *pybuf;
 
-	bContext *C= (bContext *)BPy_GetContext();
+	bContext *C = (bContext *)BPy_GetContext();
 
-	if (C==NULL) {
+	if (C == NULL) {
 		PyErr_SetString(PyExc_RuntimeError, "Context is None, cant get the string representation of this object.");
 		return NULL;
 	}
@@ -325,7 +325,7 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
 	if (!PyArg_ParseTuple(args, "s|O!i:_bpy.ops.as_string", &opname, &PyDict_Type, &kw, &all_args))
 		return NULL;
 
-	ot= WM_operatortype_find(opname, TRUE);
+	ot = WM_operatortype_find(opname, TRUE);
 
 	if (ot == NULL) {
 		PyErr_Format(PyExc_AttributeError,
@@ -339,23 +339,23 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
 	RNA_pointer_create(NULL, ot->srna, NULL, &ptr);
 
 	if (kw && PyDict_Size(kw))
-		error_val= pyrna_pydict_to_props(&ptr, kw, 0, "Converting py args to operator properties: ");
+		error_val = pyrna_pydict_to_props(&ptr, kw, 0, "Converting py args to operator properties: ");
 
-	if (error_val==0)
-		buf= WM_operator_pystring(C, ot, &ptr, all_args);
+	if (error_val == 0)
+		buf = WM_operator_pystring(C, ot, &ptr, all_args);
 
 	WM_operator_properties_free(&ptr);
 
-	if (error_val==-1) {
+	if (error_val == -1) {
 		return NULL;
 	}
 
 	if (buf) {
-		pybuf= PyUnicode_FromString(buf);
+		pybuf = PyUnicode_FromString(buf);
 		MEM_freeN(buf);
 	}
 	else {
-		pybuf= PyUnicode_FromString("");
+		pybuf = PyUnicode_FromString("");
 	}
 
 	return pybuf;
@@ -363,13 +363,13 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
 
 static PyObject *pyop_dir(PyObject *UNUSED(self))
 {
-	GHashIterator *iter= WM_operatortype_iter();
-	PyObject *list= PyList_New(0), *name;
+	GHashIterator *iter = WM_operatortype_iter();
+	PyObject *list = PyList_New(0), *name;
 
 	for ( ; !BLI_ghashIterator_isDone(iter); BLI_ghashIterator_step(iter)) {
-		wmOperatorType *ot= BLI_ghashIterator_getValue(iter);
+		wmOperatorType *ot = BLI_ghashIterator_getValue(iter);
 
-		name= PyUnicode_FromString(ot->idname);
+		name = PyUnicode_FromString(ot->idname);
 		PyList_Append(list, name);
 		Py_DECREF(name);
 	}
@@ -382,15 +382,15 @@ static PyObject *pyop_getrna(PyObject *UNUSED(self), PyObject *value)
 {
 	wmOperatorType *ot;
 	PointerRNA ptr;
-	const char *opname= _PyUnicode_AsString(value);
-	BPy_StructRNA *pyrna= NULL;
+	const char *opname = _PyUnicode_AsString(value);
+	BPy_StructRNA *pyrna = NULL;
 	
-	if (opname==NULL) {
+	if (opname == NULL) {
 		PyErr_SetString(PyExc_TypeError, "_bpy.ops.get_rna() expects a string argument");
 		return NULL;
 	}
-	ot= WM_operatortype_find(opname, TRUE);
-	if (ot==NULL) {
+	ot = WM_operatortype_find(opname, TRUE);
+	if (ot  == NULL) {
 		PyErr_Format(PyExc_KeyError, "_bpy.ops.get_rna(\"%s\") not found", opname);
 		return NULL;
 	}
@@ -403,9 +403,9 @@ static PyObject *pyop_getrna(PyObject *UNUSED(self), PyObject *value)
 	WM_operator_properties_sanitize(&ptr, 0);
 
 	
-	pyrna= (BPy_StructRNA *)pyrna_struct_CreatePyObject(&ptr);
+	pyrna = (BPy_StructRNA *)pyrna_struct_CreatePyObject(&ptr);
 #ifdef PYRNA_FREE_SUPPORT
-	pyrna->freeptr= TRUE;
+	pyrna->freeptr = TRUE;
 #endif
 	return (PyObject *)pyrna;
 }
@@ -415,40 +415,40 @@ static PyObject *pyop_getinstance(PyObject *UNUSED(self), PyObject *value)
 	wmOperatorType *ot;
 	wmOperator *op;
 	PointerRNA ptr;
-	const char *opname= _PyUnicode_AsString(value);
-	BPy_StructRNA *pyrna= NULL;
+	const char *opname = _PyUnicode_AsString(value);
+	BPy_StructRNA *pyrna = NULL;
 
-	if (opname==NULL) {
+	if (opname == NULL) {
 		PyErr_SetString(PyExc_TypeError, "_bpy.ops.get_instance() expects a string argument");
 		return NULL;
 	}
-	ot= WM_operatortype_find(opname, TRUE);
-	if (ot==NULL) {
+	ot = WM_operatortype_find(opname, TRUE);
+	if (ot == NULL) {
 		PyErr_Format(PyExc_KeyError, "_bpy.ops.get_instance(\"%s\") not found", opname);
 		return NULL;
 	}
 
 #ifdef PYRNA_FREE_SUPPORT
-	op= MEM_callocN(sizeof(wmOperator), __func__);
+	op = MEM_callocN(sizeof(wmOperator), __func__);
 #else
-	op= PyMem_MALLOC(sizeof(wmOperator));
+	op = PyMem_MALLOC(sizeof(wmOperator));
 	memset(op, 0, sizeof(wmOperator));
 #endif
 	BLI_strncpy(op->idname, op->idname, sizeof(op->idname)); /* incase its needed */
-	op->type= ot;
+	op->type = ot;
 
 	RNA_pointer_create(NULL, &RNA_Operator, op, &ptr);
 
-	pyrna= (BPy_StructRNA *)pyrna_struct_CreatePyObject(&ptr);
+	pyrna = (BPy_StructRNA *)pyrna_struct_CreatePyObject(&ptr);
 #ifdef PYRNA_FREE_SUPPORT
-	pyrna->freeptr= TRUE;
+	pyrna->freeptr = TRUE;
 #endif
-	op->ptr= &pyrna->ptr;
+	op->ptr = &pyrna->ptr;
 
 	return (PyObject *)pyrna;
 }
 
-static struct PyMethodDef bpy_ops_methods[]= {
+static struct PyMethodDef bpy_ops_methods[] = {
 	{"poll", (PyCFunction) pyop_poll, METH_VARARGS, NULL},
 	{"call", (PyCFunction) pyop_call, METH_VARARGS, NULL},
 	{"as_string", (PyCFunction) pyop_as_string, METH_VARARGS, NULL},
@@ -459,7 +459,7 @@ static struct PyMethodDef bpy_ops_methods[]= {
 	{NULL, NULL, 0, NULL}
 };
 
-static struct PyModuleDef bpy_ops_module= {
+static struct PyModuleDef bpy_ops_module = {
 	PyModuleDef_HEAD_INIT,
 	"_bpy.ops",
 	NULL,
@@ -472,7 +472,7 @@ PyObject *BPY_operator_module(void)
 {
 	PyObject *submodule;
 
-	submodule= PyModule_Create(&bpy_ops_module);
+	submodule = PyModule_Create(&bpy_ops_module);
 
 	return submodule;
 }