Merged changes in the trunk up to revision 45308.

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c

1 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c
index 14058c96633..8f5a9fec86b 100644
--- a/source/blender/python/intern/bpy_operator.c
+++ b/source/blender/python/intern/bpy_operator.c
@@ -65,11 +65,11 @@
 static PyObject *pyop_poll(PyObject *UNUSED(self), PyObject *args)
 {
 	wmOperatorType *ot;
-	char		*opname;
-	PyObject	*context_dict = NULL; /* optional args */
-	PyObject	*context_dict_back;
-	char		*context_str = NULL;
-	PyObject	*ret;
+	char     *opname;
+	PyObject *context_dict = NULL; /* optional args */
+	PyObject *context_dict_back;
+	char     *context_str = NULL;
+	PyObject *ret;
 
 	int context = WM_OP_EXEC_DEFAULT;
 
@@ -139,11 +139,11 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args)
 	PointerRNA ptr;
 	int operator_ret = OPERATOR_CANCELLED;
 
-	char		*opname;
-	char		*context_str = NULL;
-	PyObject	*kw = NULL; /* optional args */
-	PyObject	*context_dict = NULL; /* optional args */
-	PyObject	*context_dict_back;
+	char     *opname;
+	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;
@@ -306,8 +306,8 @@ static PyObject *pyop_as_string(PyObject *UNUSED(self), PyObject *args)
 	wmOperatorType *ot;
 	PointerRNA ptr;
 
-	char		*opname;
-	PyObject	*kw = NULL; /* optional args */
+	char     *opname;
+	PyObject *kw = NULL; /* optional args */
 	int all_args = 1;
 	int error_val = 0;
 
@@ -462,7 +462,7 @@ static struct PyModuleDef bpy_ops_module = {
 	PyModuleDef_HEAD_INIT,
 	"_bpy.ops",
 	NULL,
-	-1,/* multiple "initialization" just copies the module dict. */
+	-1, /* multiple "initialization" just copies the module dict. */
 	bpy_ops_methods,
 	NULL, NULL, NULL, NULL
 };