diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-17 01:39:56 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-17 01:39:56 +0400 |
commit | 70d3d1aca6612d8168d80ca72938dad06086003b (patch) | |
tree | 94c48e2f9beadc22df7b74a283ce37c6a33e9458 /source/blender/python/intern | |
parent | 56da174b14de74ebc141b0242e1eb7ccf8058353 (diff) |
style cleanup: py/capi
Diffstat (limited to 'source/blender/python/intern')
-rw-r--r-- | source/blender/python/intern/bpy_app_handlers.c | 14 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_interface.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_library.c | 8 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_props.c | 24 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 235 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna_array.c | 84 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_traceback.c | 8 | ||||
-rw-r--r-- | source/blender/python/intern/gpu.c | 26 | ||||
-rw-r--r-- | source/blender/python/intern/gpu.h | 2 |
9 files changed, 201 insertions, 202 deletions
diff --git a/source/blender/python/intern/bpy_app_handlers.c b/source/blender/python/intern/bpy_app_handlers.c index daa842f0629..54848161b89 100644 --- a/source/blender/python/intern/bpy_app_handlers.c +++ b/source/blender/python/intern/bpy_app_handlers.c @@ -256,10 +256,10 @@ void BPY_app_handlers_reset(const short do_all) for (i = PyList_GET_SIZE(ls) - 1; i >= 0; i--) { - if ( (PyFunction_Check((item = PyList_GET_ITEM(ls, i)))) && - (dict_ptr = _PyObject_GetDictPtr(item)) && - (*dict_ptr) && - (PyDict_GetItem(*dict_ptr, perm_id_str) != NULL)) + if ((PyFunction_Check((item = PyList_GET_ITEM(ls, i)))) && + (dict_ptr = _PyObject_GetDictPtr(item)) && + (*dict_ptr) && + (PyDict_GetItem(*dict_ptr, perm_id_str) != NULL)) { /* keep */ } @@ -283,9 +283,9 @@ void bpy_app_generic_callback(struct Main *UNUSED(main), struct ID *id, void *ar if ((cb_list_len = PyList_GET_SIZE(cb_list)) > 0) { PyGILState_STATE gilstate = PyGILState_Ensure(); - PyObject* args = PyTuple_New(1); // save python creating each call - PyObject* func; - PyObject* ret; + PyObject *args = PyTuple_New(1); // save python creating each call + PyObject *func; + PyObject *ret; Py_ssize_t pos; /* setup arguments */ diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 1ef9c0d3214..7e04f890303 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -238,7 +238,7 @@ void BPY_python_start(int argc, const char **argv) Py_Initialize(); // PySys_SetArgv(argc, argv); // broken in py3, not a huge deal - /* sigh, why do python guys not have a char** version anymore? :( */ + /* sigh, why do python guys not have a (char **) version anymore? */ { int i; PyObject *py_argv = PyList_New(argc); diff --git a/source/blender/python/intern/bpy_library.c b/source/blender/python/intern/bpy_library.c index ed3b758a6b4..ee50fde35d6 100644 --- a/source/blender/python/intern/bpy_library.c +++ b/source/blender/python/intern/bpy_library.c @@ -62,7 +62,7 @@ #endif typedef struct { - PyObject_HEAD /* required python macro */ + PyObject_HEAD /* required python macro */ /* collection iterator specific parts */ char relpath[FILE_MAX]; char abspath[FILE_MAX]; /* absolute path */ @@ -186,7 +186,7 @@ static PyObject *bpy_lib_load(PyObject *UNUSED(self), PyObject *args, PyObject * { static const char *kwlist[] = {"filepath", "link", "relative", NULL}; BPy_Library *ret; - const char* filename = NULL; + const char *filename = NULL; int is_rel = 0, is_link = 0; if (!PyArg_ParseTupleAndKeywords(args, kwds, "s|ii:load", (char **)kwlist, &filename, &is_link, &is_rel)) @@ -199,8 +199,8 @@ static PyObject *bpy_lib_load(PyObject *UNUSED(self), PyObject *args, PyObject * BLI_path_abs(ret->abspath, G.main->name); ret->blo_handle = NULL; - ret->flag= (is_link ? FILE_LINK : 0) | - (is_rel ? FILE_RELPATH : 0); + ret->flag = ((is_link ? FILE_LINK : 0) | + (is_rel ? FILE_RELPATH : 0)); ret->dict = PyDict_New(); diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index ac832611ded..7beb78e8519 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -155,10 +155,10 @@ static void printf_func_error(PyObject *py_func) /* use py style error */ fprintf(stderr, "File \"%s\", line %d, in %s\n", - _PyUnicode_AsString(f_code->co_filename), - f_code->co_firstlineno, - _PyUnicode_AsString(((PyFunctionObject *)py_func)->func_name) - ); + _PyUnicode_AsString(f_code->co_filename), + f_code->co_firstlineno, + _PyUnicode_AsString(((PyFunctionObject *)py_func)->func_name) + ); } /* operators and classes use this so it can store the args given but defer @@ -1033,14 +1033,14 @@ static EnumPropertyItem *enum_items_from_py(PyObject *seq_fast, PyObject *def, i item = PySequence_Fast_GET_ITEM(seq_fast, i); - if ( (PyTuple_CheckExact(item)) && - (item_size = PyTuple_GET_SIZE(item)) && - (item_size == 3 || item_size == 4) && - (tmp.identifier = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 0), &id_str_size)) && - (tmp.name = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 1), &name_str_size)) && - (tmp.description = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 2), &desc_str_size)) && - /* TODO, number isnt ensured to be unique from the script author */ - (item_size < 4 || py_long_as_int(PyTuple_GET_ITEM(item, 3), &tmp.value) != -1)) + if ((PyTuple_CheckExact(item)) && + (item_size = PyTuple_GET_SIZE(item)) && + (item_size == 3 || item_size == 4) && + (tmp.identifier = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 0), &id_str_size)) && + (tmp.name = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 1), &name_str_size)) && + (tmp.description = _PyUnicode_AsStringAndSize(PyTuple_GET_ITEM(item, 2), &desc_str_size)) && + /* TODO, number isnt ensured to be unique from the script author */ + (item_size < 4 || py_long_as_int(PyTuple_GET_ITEM(item, 3), &tmp.value) != -1)) { if (is_enum_flag) { if (item_size < 4) { diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 56c892c7d9f..80cf3048a8a 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -85,7 +85,7 @@ #define USE_MATHUTILS #define USE_STRING_COERCE -static PyObject* pyrna_struct_Subtype(PointerRNA *ptr); +static PyObject *pyrna_struct_Subtype(PointerRNA *ptr); static PyObject *pyrna_prop_collection_values(BPy_PropertyRNA *self); #define BPY_DOC_ID_PROP_TYPE_NOTE \ @@ -756,15 +756,15 @@ int pyrna_enum_value_from_id(EnumPropertyItem *item, const char *identifier, int static int pyrna_struct_compare(BPy_StructRNA *a, BPy_StructRNA *b) { - return ( (a->ptr.data == b->ptr.data) && - (a->ptr.type == b->ptr.type)) ? 0 : -1; + return (((a->ptr.data == b->ptr.data) && + (a->ptr.type == b->ptr.type)) ? 0 : -1); } static int pyrna_prop_compare(BPy_PropertyRNA *a, BPy_PropertyRNA *b) { - return ( (a->prop == b->prop) && + return (((a->prop == b->prop) && (a->ptr.data == b->ptr.data) && - (a->ptr.type == b->ptr.type) ) ? 0 : -1; + (a->ptr.type == b->ptr.type)) ? 0 : -1); } static PyObject *pyrna_struct_richcmp(PyObject *a, PyObject *b, int op) @@ -776,21 +776,21 @@ static PyObject *pyrna_struct_richcmp(PyObject *a, PyObject *b, int op) ok = pyrna_struct_compare((BPy_StructRNA *)a, (BPy_StructRNA *)b); switch (op) { - case Py_NE: - ok = !ok; /* pass through */ - case Py_EQ: - res = ok ? Py_False : Py_True; - break; + case Py_NE: + ok = !ok; /* pass through */ + case Py_EQ: + res = ok ? Py_False : Py_True; + break; - case Py_LT: - case Py_LE: - case Py_GT: - case Py_GE: - res = Py_NotImplemented; - break; - default: - PyErr_BadArgument(); - return NULL; + case Py_LT: + case Py_LE: + case Py_GT: + case Py_GE: + res = Py_NotImplemented; + break; + default: + PyErr_BadArgument(); + return NULL; } return Py_INCREF(res), res; @@ -805,21 +805,21 @@ static PyObject *pyrna_prop_richcmp(PyObject *a, PyObject *b, int op) ok = pyrna_prop_compare((BPy_PropertyRNA *)a, (BPy_PropertyRNA *)b); switch (op) { - case Py_NE: - ok = !ok; /* pass through */ - case Py_EQ: - res = ok ? Py_False : Py_True; - break; + case Py_NE: + ok = !ok; /* pass through */ + case Py_EQ: + res = ok ? Py_False : Py_True; + break; - case Py_LT: - case Py_LE: - case Py_GT: - case Py_GE: - res = Py_NotImplemented; - break; - default: - PyErr_BadArgument(); - return NULL; + case Py_LT: + case Py_LE: + case Py_GT: + case Py_GE: + res = Py_NotImplemented; + break; + default: + PyErr_BadArgument(); + return NULL; } return Py_INCREF(res), res; @@ -912,7 +912,7 @@ static PyObject *pyrna_prop_str(BPy_PropertyRNA *self) int len = -1; char *c = type_fmt; - while ((*c++= tolower(*type_id++))) {} + while ((*c++ = tolower(*type_id++))) {} if (type == PROP_COLLECTION) { len = pyrna_prop_collection_length(self); @@ -1694,9 +1694,9 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb * if this causes problems in the future it should be removed. */ if ((ptr_type == &RNA_AnyType) && - (BPy_StructRNA_Check(value)) && - (RNA_struct_is_a(((BPy_StructRNA *)value)->ptr.type, &RNA_Operator)) - ) { + (BPy_StructRNA_Check(value)) && + (RNA_struct_is_a(((BPy_StructRNA *)value)->ptr.type, &RNA_Operator))) + { value = PyObject_GetAttrString(value, "properties"); value_new = value; } @@ -2640,7 +2640,7 @@ static int prop_subscript_ass_array_slice(PointerRNA *ptr, PropertyRNA *prop, RNA_property_float_get_array(ptr, prop, values); for (count = start; count < stop; count++) { - fval = PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, count-start)); + fval = PyFloat_AsDouble(PySequence_Fast_GET_ITEM(value, count - start)); CLAMP(fval, min, max); values[count] = fval; } @@ -2660,7 +2660,7 @@ static int prop_subscript_ass_array_slice(PointerRNA *ptr, PropertyRNA *prop, RNA_property_boolean_get_array(ptr, prop, values); for (count = start; count < stop; count++) - values[count] = PyLong_AsLong(PySequence_Fast_GET_ITEM(value, count-start)); + values[count] = PyLong_AsLong(PySequence_Fast_GET_ITEM(value, count - start)); if (PyErr_Occurred()) ret = -1; else RNA_property_boolean_set_array(ptr, prop, values); @@ -4034,7 +4034,7 @@ static PyObject *pyrna_struct_get(BPy_StructRNA *self, PyObject *args) IDProperty *group, *idprop; const char *key; - PyObject* def = Py_None; + PyObject *def = Py_None; PYRNA_STRUCT_CHECK_OBJ(self); @@ -4092,7 +4092,7 @@ static PyObject *pyrna_prop_collection_get(BPy_PropertyRNA *self, PyObject *args PointerRNA newptr; PyObject *key_ob; - PyObject* def = Py_None; + PyObject *def = Py_None; PYRNA_PROP_CHECK_OBJ(self); @@ -4166,9 +4166,9 @@ static PyObject *pyrna_prop_collection_find(BPy_PropertyRNA *self, PyObject *key return PyLong_FromSsize_t(index); } -static void foreach_attr_type( BPy_PropertyRNA *self, const char *attr, - /* values to assign */ - RawPropertyType *raw_type, int *attr_tot, int *attr_signed) +static void foreach_attr_type(BPy_PropertyRNA *self, const char *attr, + /* values to assign */ + RawPropertyType *raw_type, int *attr_tot, int *attr_signed) { PropertyRNA *prop; *raw_type = PROP_RAW_UNSET; @@ -4190,8 +4190,8 @@ static void foreach_attr_type( BPy_PropertyRNA *self, const char *attr, static int foreach_parse_args( BPy_PropertyRNA *self, PyObject *args, - /*values to assign */ - const char **attr, PyObject **seq, int *tot, int *size, + /* values to assign */ + const char **attr, PyObject **seq, int *tot, int *size, RawPropertyType *raw_type, int *attr_tot, int *attr_signed ) { @@ -4250,21 +4250,21 @@ static int foreach_compat_buffer(RawPropertyType raw_type, int attr_signed, cons char f = format ? *format:'B'; /* B is assumed when not set */ switch (raw_type) { - case PROP_RAW_CHAR: - if (attr_signed) return (f == 'b') ? 1:0; - else return (f == 'B') ? 1:0; - case PROP_RAW_SHORT: - if (attr_signed) return (f == 'h') ? 1:0; - else return (f == 'H') ? 1:0; - case PROP_RAW_INT: - if (attr_signed) return (f == 'i') ? 1:0; - else return (f == 'I') ? 1:0; - case PROP_RAW_FLOAT: - return (f == 'f') ? 1:0; - case PROP_RAW_DOUBLE: - return (f == 'd') ? 1:0; - case PROP_RAW_UNSET: - return 0; + case PROP_RAW_CHAR: + if (attr_signed) return (f == 'b') ? 1:0; + else return (f == 'B') ? 1:0; + case PROP_RAW_SHORT: + if (attr_signed) return (f == 'h') ? 1:0; + else return (f == 'H') ? 1:0; + case PROP_RAW_INT: + if (attr_signed) return (f == 'i') ? 1:0; + else return (f == 'I') ? 1:0; + case PROP_RAW_FLOAT: + return (f == 'f') ? 1:0; + case PROP_RAW_DOUBLE: + return (f == 'd') ? 1:0; + case PROP_RAW_UNSET: + return 0; } return 0; @@ -4314,25 +4314,25 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set) for ( ; i < tot; i++) { item = PySequence_GetItem(seq, i); switch (raw_type) { - case PROP_RAW_CHAR: - ((char *)array)[i] = (char)PyLong_AsLong(item); - break; - case PROP_RAW_SHORT: - ((short *)array)[i] = (short)PyLong_AsLong(item); - break; - case PROP_RAW_INT: - ((int *)array)[i] = (int)PyLong_AsLong(item); - break; - case PROP_RAW_FLOAT: - ((float *)array)[i] = (float)PyFloat_AsDouble(item); - break; - case PROP_RAW_DOUBLE: - ((double *)array)[i] = (double)PyFloat_AsDouble(item); - break; - case PROP_RAW_UNSET: - /* should never happen */ - BLI_assert(!"Invalid array type - set"); - break; + case PROP_RAW_CHAR: + ((char *)array)[i] = (char)PyLong_AsLong(item); + break; + case PROP_RAW_SHORT: + ((short *)array)[i] = (short)PyLong_AsLong(item); + break; + case PROP_RAW_INT: + ((int *)array)[i] = (int)PyLong_AsLong(item); + break; + case PROP_RAW_FLOAT: + ((float *)array)[i] = (float)PyFloat_AsDouble(item); + break; + case PROP_RAW_DOUBLE: + ((double *)array)[i] = (double)PyFloat_AsDouble(item); + break; + case PROP_RAW_UNSET: + /* should never happen */ + BLI_assert(!"Invalid array type - set"); + break; } Py_DECREF(item); @@ -4369,27 +4369,27 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set) for ( ; i < tot; i++) { switch (raw_type) { - case PROP_RAW_CHAR: - item = PyLong_FromSsize_t((Py_ssize_t) ((char *)array)[i]); - break; - case PROP_RAW_SHORT: - item = PyLong_FromSsize_t((Py_ssize_t) ((short *)array)[i]); - break; - case PROP_RAW_INT: - item = PyLong_FromSsize_t((Py_ssize_t) ((int *)array)[i]); - break; - case PROP_RAW_FLOAT: - item = PyFloat_FromDouble((double) ((float *)array)[i]); - break; - case PROP_RAW_DOUBLE: - item = PyFloat_FromDouble((double) ((double *)array)[i]); - break; - default: /* PROP_RAW_UNSET */ - /* should never happen */ - BLI_assert(!"Invalid array type - get"); - item = Py_None; - Py_INCREF(item); - break; + case PROP_RAW_CHAR: + item = PyLong_FromSsize_t((Py_ssize_t) ((char *)array)[i]); + break; + case PROP_RAW_SHORT: + item = PyLong_FromSsize_t((Py_ssize_t) ((short *)array)[i]); + break; + case PROP_RAW_INT: + item = PyLong_FromSsize_t((Py_ssize_t) ((int *)array)[i]); + break; + case PROP_RAW_FLOAT: + item = PyFloat_FromDouble((double) ((float *)array)[i]); + break; + case PROP_RAW_DOUBLE: + item = PyFloat_FromDouble((double) ((double *)array)[i]); + break; + default: /* PROP_RAW_UNSET */ + /* should never happen */ + BLI_assert(!"Invalid array type - get"); + item = Py_None; + Py_INCREF(item); + break; } PySequence_SetItem(seq, i, item); @@ -5922,10 +5922,10 @@ static void pyrna_subtype_set_rna(PyObject *newclass, StructRNA *srna) /* done with rna instance */ } -static PyObject* pyrna_srna_Subtype(StructRNA *srna); +static PyObject *pyrna_srna_Subtype(StructRNA *srna); /* return a borrowed reference */ -static PyObject* pyrna_srna_PyBase(StructRNA *srna) //, PyObject *bpy_types_dict) +static PyObject *pyrna_srna_PyBase(StructRNA *srna) //, PyObject *bpy_types_dict) { /* Assume RNA_struct_py_type_get(srna) was already checked */ StructRNA *base; @@ -5952,7 +5952,7 @@ static PyObject* pyrna_srna_PyBase(StructRNA *srna) //, PyObject *bpy_types_dict * return a borrowed reference */ static PyObject *bpy_types_dict = NULL; -static PyObject* pyrna_srna_ExternalType(StructRNA *srna) +static PyObject *pyrna_srna_ExternalType(StructRNA *srna) { const char *idname = RNA_struct_identifier(srna); PyObject *newclass; @@ -6002,7 +6002,7 @@ static PyObject* pyrna_srna_ExternalType(StructRNA *srna) return newclass; } -static PyObject* pyrna_srna_Subtype(StructRNA *srna) +static PyObject *pyrna_srna_Subtype(StructRNA *srna) { PyObject *newclass = NULL; @@ -6035,8 +6035,8 @@ static PyObject* pyrna_srna_Subtype(StructRNA *srna) // if (!descr) descr = "(no docs)"; // "__doc__", descr - if ( RNA_struct_idprops_check(srna) && - !PyObject_IsSubclass(py_base, (PyObject *)&pyrna_struct_meta_idprop_Type)) + if (RNA_struct_idprops_check(srna) && + !PyObject_IsSubclass(py_base, (PyObject *)&pyrna_struct_meta_idprop_Type)) { metaclass = (PyObject *)&pyrna_struct_meta_idprop_Type; } @@ -6082,7 +6082,7 @@ static StructRNA *srna_from_ptr(PointerRNA *ptr) } /* always returns a new ref, be sure to decref when done */ -static PyObject* pyrna_struct_Subtype(PointerRNA *ptr) +static PyObject *pyrna_struct_Subtype(PointerRNA *ptr) { return pyrna_srna_Subtype(srna_from_ptr(ptr)); } @@ -6588,10 +6588,10 @@ static int pyrna_deferred_register_class_recursive(StructRNA *srna, PyTypeObject * * So only scan base classes which are not subclasses if blender types. * This best fits having 'mix-in' classes for operators and render engines. - * */ + */ if (py_superclass != &PyBaseObject_Type && - !PyObject_IsSubclass((PyObject *)py_superclass, (PyObject *)&pyrna_struct_Type) - ) { + !PyObject_IsSubclass((PyObject *)py_superclass, (PyObject *)&pyrna_struct_Type)) + { ret = pyrna_deferred_register_class_recursive(srna, py_superclass); if (ret != 0) { @@ -7016,8 +7016,7 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param if (err == -1) { PyC_Err_Format_Prefix(PyExc_RuntimeError, "class %.200s, function %.200s: incompatible return value ", - RNA_struct_identifier(ptr->type), RNA_function_identifier(func) - ); + RNA_struct_identifier(ptr->type), RNA_function_identifier(func)); } } else if (ret_len > 1) { @@ -7065,10 +7064,10 @@ static int bpy_class_call(bContext *C, PointerRNA *ptr, FunctionRNA *func, Param if (err != 0) { ReportList *reports; /* alert the user, else they wont know unless they see the console. */ - if ( (!is_static) && - (ptr->data) && - (RNA_struct_is_a(ptr->type, &RNA_Operator)) && - (is_valid_wm == (CTX_wm_manager(C) != NULL))) + if ((!is_static) && + (ptr->data) && + (RNA_struct_is_a(ptr->type, &RNA_Operator)) && + (is_valid_wm == (CTX_wm_manager(C) != NULL))) { wmOperator *op = ptr->data; reports = op->reports; @@ -7106,7 +7105,7 @@ static void bpy_class_free(void *pyob_ptr) PyErr_Clear(); #if 0 /* needs further investigation, too annoying so quiet for now */ - if (G.f&G_DEBUG) { + if (G.f & G_DEBUG) { if (self->ob_refcnt > 1) { PyC_ObSpit("zombie class - ref should be 1", self); } diff --git a/source/blender/python/intern/bpy_rna_array.c b/source/blender/python/intern/bpy_rna_array.c index 187db194c36..6e6eb015387 100644 --- a/source/blender/python/intern/bpy_rna_array.c +++ b/source/blender/python/intern/bpy_rna_array.c @@ -550,21 +550,21 @@ int pyrna_py_to_array(PointerRNA *ptr, PropertyRNA *prop, char *param_data, { int ret; switch (RNA_property_type(prop)) { - case PROP_FLOAT: - ret = py_to_array(py, ptr, prop, param_data, py_float_check, "float", sizeof(float), - py_to_float, (RNA_SetArrayFunc)RNA_property_float_set_array, error_prefix); - break; - case PROP_INT: - ret = py_to_array(py, ptr, prop, param_data, py_int_check, "int", sizeof(int), - py_to_int, (RNA_SetArrayFunc)RNA_property_int_set_array, error_prefix); - break; - case PROP_BOOLEAN: - ret = py_to_array(py, ptr, prop, param_data, py_bool_check, "boolean", sizeof(int), - py_to_bool, (RNA_SetArrayFunc)RNA_property_boolean_set_array, error_prefix); - break; - default: - PyErr_SetString(PyExc_TypeError, "not an array type"); - ret = -1; + case PROP_FLOAT: + ret = py_to_array(py, ptr, prop, param_data, py_float_check, "float", sizeof(float), + py_to_float, (RNA_SetArrayFunc)RNA_property_float_set_array, error_prefix); + break; + case PROP_INT: + ret = py_to_array(py, ptr, prop, param_data, py_int_check, "int", sizeof(int), + py_to_int, (RNA_SetArrayFunc)RNA_property_int_set_array, error_prefix); + break; + case PROP_BOOLEAN: + ret = py_to_array(py, ptr, prop, param_data, py_bool_check, "boolean", sizeof(int), + py_to_bool, (RNA_SetArrayFunc)RNA_property_boolean_set_array, error_prefix); + break; + default: + PyErr_SetString(PyExc_TypeError, "not an array type"); + ret = -1; } return ret; @@ -575,21 +575,21 @@ int pyrna_py_to_array_index(PointerRNA *ptr, PropertyRNA *prop, int arraydim, in { int ret; switch (RNA_property_type(prop)) { - case PROP_FLOAT: - ret = py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, - py_float_check, "float", py_to_float, float_set_index, error_prefix); - break; - case PROP_INT: - ret = py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, - py_int_check, "int", py_to_int, int_set_index, error_prefix); - break; - case PROP_BOOLEAN: - ret = py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, - py_bool_check, "boolean", py_to_bool, bool_set_index, error_prefix); - break; - default: - PyErr_SetString(PyExc_TypeError, "not an array type"); - ret = -1; + case PROP_FLOAT: + ret = py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, + py_float_check, "float", py_to_float, float_set_index, error_prefix); + break; + case PROP_INT: + ret = py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, + py_int_check, "int", py_to_int, int_set_index, error_prefix); + break; + case PROP_BOOLEAN: + ret = py_to_array_index(py, ptr, prop, arraydim, arrayoffset, index, + py_bool_check, "boolean", py_to_bool, bool_set_index, error_prefix); + break; + default: + PyErr_SetString(PyExc_TypeError, "not an array type"); + ret = -1; } return ret; @@ -600,18 +600,18 @@ PyObject *pyrna_array_index(PointerRNA *ptr, PropertyRNA *prop, int index) PyObject *item; switch (RNA_property_type(prop)) { - case PROP_FLOAT: - item = PyFloat_FromDouble(RNA_property_float_get_index(ptr, prop, index)); - break; - case PROP_BOOLEAN: - item = PyBool_FromLong(RNA_property_boolean_get_index(ptr, prop, index)); - break; - case PROP_INT: - item = PyLong_FromSsize_t(RNA_property_int_get_index(ptr, prop, index)); - break; - default: - PyErr_SetString(PyExc_TypeError, "not an array type"); - item = NULL; + case PROP_FLOAT: + item = PyFloat_FromDouble(RNA_property_float_get_index(ptr, prop, index)); + break; + case PROP_BOOLEAN: + item = PyBool_FromLong(RNA_property_boolean_get_index(ptr, prop, index)); + break; + case PROP_INT: + item = PyLong_FromSsize_t(RNA_property_int_get_index(ptr, prop, index)); + break; + default: + PyErr_SetString(PyExc_TypeError, "not an array type"); + item = NULL; } return item; diff --git a/source/blender/python/intern/bpy_traceback.c b/source/blender/python/intern/bpy_traceback.c index 01eb2653681..aaba90604f5 100644 --- a/source/blender/python/intern/bpy_traceback.c +++ b/source/blender/python/intern/bpy_traceback.c @@ -54,7 +54,7 @@ parse_syntax_error(PyObject *err, PyObject **message, const char **filename, /* new style errors. `err' is an instance */ - if (! (v = PyObject_GetAttrString(err, "msg"))) + if (!(v = PyObject_GetAttrString(err, "msg"))) goto finally; *message = v; @@ -62,7 +62,7 @@ parse_syntax_error(PyObject *err, PyObject **message, const char **filename, goto finally; if (v == Py_None) *filename = NULL; - else if (! (*filename = _PyUnicode_AsString(v))) + else if (!(*filename = _PyUnicode_AsString(v))) goto finally; Py_DECREF(v); @@ -131,8 +131,8 @@ void python_script_error_jump(const char *filepath, int *lineno, int *offset) if (parse_syntax_error(value, &message, &filename, lineno, offset, &text)) { /* python adds a '/', prefix, so check for both */ if ((BLI_path_cmp(filename, filepath) == 0) || - ((filename[0] == '\\' || filename[0] == '/') && BLI_path_cmp(filename + 1, filepath) == 0) - ) { + ((filename[0] == '\\' || filename[0] == '/') && BLI_path_cmp(filename + 1, filepath) == 0)) + { /* good */ } else { diff --git a/source/blender/python/intern/gpu.c b/source/blender/python/intern/gpu.c index 552abaaf414..cc7506f863e 100644 --- a/source/blender/python/intern/gpu.c +++ b/source/blender/python/intern/gpu.c @@ -77,7 +77,7 @@ static struct PyModuleDef gpumodule = { PyMODINIT_FUNC PyInit_gpu(void) { - PyObject* m; + PyObject *m; m = PyModule_Create(&gpumodule); if (m == NULL) @@ -155,14 +155,14 @@ PyDoc_STRVAR(GPU_export_shader_doc, " :return: Dictionary defining the shader, uniforms and attributes.\n" " :rtype: Dict" ); -static PyObject* GPU_export_shader(PyObject* UNUSED(self), PyObject *args, PyObject *kwds) +static PyObject *GPU_export_shader(PyObject *UNUSED(self), PyObject *args, PyObject *kwds) { - PyObject* pyscene; - PyObject* pymat; - PyObject* result; - PyObject* dict; - PyObject* val; - PyObject* seq; + PyObject *pyscene; + PyObject *pymat; + PyObject *result; + PyObject *dict; + PyObject *val; + PyObject *seq; int i; Scene *scene; @@ -174,7 +174,7 @@ static PyObject* GPU_export_shader(PyObject* UNUSED(self), PyObject *args, PyObj static const char *kwlist[] = {"scene", "material", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO:export_shader", (char**)(kwlist), &pyscene, &pymat)) + if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO:export_shader", (char **)(kwlist), &pyscene, &pymat)) return NULL; scene = (Scene *)PyC_RNA_AsPointer(pyscene, "Scene"); @@ -202,7 +202,7 @@ static PyObject* GPU_export_shader(PyObject* UNUSED(self), PyObject *args, PyObj PY_DICT_ADD_STRING(result,shader,vertex); } seq = PyList_New(BLI_countlist(&shader->uniforms)); - for (i=0, uniform=shader->uniforms.first; uniform; uniform=uniform->next, i++) { + for (i = 0, uniform = shader->uniforms.first; uniform; uniform = uniform->next, i++) { dict = PyDict_New(); PY_DICT_ADD_STRING(dict,uniform,varname); PY_DICT_ADD_LONG(dict,uniform,datatype); @@ -230,7 +230,7 @@ static PyObject* GPU_export_shader(PyObject* UNUSED(self), PyObject *args, PyObj Py_DECREF(seq); seq = PyList_New(BLI_countlist(&shader->attributes)); - for (i=0, attribute=shader->attributes.first; attribute; attribute=attribute->next, i++) { + for (i = 0, attribute = shader->attributes.first; attribute; attribute = attribute->next, i++) { dict = PyDict_New(); PY_DICT_ADD_STRING(dict,attribute,varname); PY_DICT_ADD_LONG(dict,attribute,datatype); @@ -260,9 +260,9 @@ static PyMethodDef meth_export_shader[] = { {"export_shader", (PyCFunction)GPU_export_shader, METH_VARARGS | METH_KEYWORDS, GPU_export_shader_doc} }; -PyObject* GPU_initPython(void) +PyObject *GPU_initPython(void) { - PyObject* module = PyInit_gpu(); + PyObject *module = PyInit_gpu(); PyModule_AddObject(module, "export_shader", (PyObject *)PyCFunction_New(meth_export_shader, NULL)); PyDict_SetItemString(PyImport_GetModuleDict(), "gpu", module); diff --git a/source/blender/python/intern/gpu.h b/source/blender/python/intern/gpu.h index bffbae13ba2..68e7fa4aa9e 100644 --- a/source/blender/python/intern/gpu.h +++ b/source/blender/python/intern/gpu.h @@ -32,5 +32,5 @@ /** * Initalizes the gpu Python module. */ -PyObject* GPU_initPython(void); +PyObject *GPU_initPython(void); |