diff options
Diffstat (limited to 'source/blender/python')
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types.h | 4 | ||||
| -rw-r--r-- | source/blender/python/bmesh/bmesh_py_types_customdata.c | 6 | ||||
| -rw-r--r-- | source/blender/python/generic/idprop_py_api.c | 5 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_operator.c | 5 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_props.c | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna_anim.c | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_rna_array.c | 5 | ||||
| -rw-r--r-- | source/blender/python/mathutils/mathutils.h | 20 |
8 files changed, 29 insertions, 24 deletions
diff --git a/source/blender/python/bmesh/bmesh_py_types.h b/source/blender/python/bmesh/bmesh_py_types.h index 460e7f82222..c61fdeab4b0 100644 --- a/source/blender/python/bmesh/bmesh_py_types.h +++ b/source/blender/python/bmesh/bmesh_py_types.h @@ -140,8 +140,8 @@ PyObject *BPy_BMFaceSeq_CreatePyObject(BMesh *bm); PyObject *BPy_BMLoopSeq_CreatePyObject(BMesh *bm); PyObject *BPy_BMIter_CreatePyObject(BMesh *bm); -PyObject *BPy_BMElem_CreatePyObject(BMesh *bm, - BMHeader *ele); /* just checks type and creates v/e/f/l */ +/* Just checks type and creates v/e/f/l. */ +PyObject *BPy_BMElem_CreatePyObject(BMesh *bm, BMHeader *ele); void *BPy_BMElem_PySeq_As_Array_FAST(BMesh **r_bm, PyObject *seq_fast, diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index 56c25edb7e4..a7f4e30b494 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -516,8 +516,10 @@ static PyObject *bpy_bmlayercollection_keys(BPy_BMLayerCollection *self) BPY_BM_CHECK_OBJ(self); data = bpy_bm_customdata_get(self->bm, self->htype); - index = CustomData_get_layer_index(data, - self->type); /* absolute, but no need to make relative */ + + /* Absolute, but no need to make relative. */ + index = CustomData_get_layer_index(data, self->type); + tot = (index != -1) ? CustomData_number_of_layers(data, self->type) : 0; ret = PyList_New(tot); diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 30cad991b55..d10d281c1f9 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -1428,8 +1428,9 @@ static int BPy_IDArray_ass_slice(BPy_IDArray *self, int begin, int end, PyObject size = (end - begin); alloc_len = size * elem_size; - vec = MEM_mallocN(alloc_len, - "array assignment"); /* NOTE: we count on int/float being the same size here */ + /* NOTE: we count on int/float being the same size here */ + vec = MEM_mallocN(alloc_len, "array assignment"); + if (PyC_AsArray(vec, seq, size, py_type, is_double, "slice assignment: ") == -1) { MEM_freeN(vec); return -1; diff --git a/source/blender/python/intern/bpy_operator.c b/source/blender/python/intern/bpy_operator.c index aef4ab6667a..5e3b000c604 100644 --- a/source/blender/python/intern/bpy_operator.c +++ b/source/blender/python/intern/bpy_operator.c @@ -252,8 +252,9 @@ static PyObject *pyop_call(PyObject *UNUSED(self), PyObject *args) ReportList *reports; reports = MEM_mallocN(sizeof(ReportList), "wmOperatorReportList"); - BKE_reports_init(reports, - RPT_STORE | RPT_OP_HOLD); /* own so these don't move into global reports */ + + /* Own so these don't move into global reports. */ + BKE_reports_init(reports, RPT_STORE | RPT_OP_HOLD); #ifdef BPY_RELEASE_GIL /* release GIL, since a thread could be started from an operator diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 70bfa76e344..9e734123caa 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -2931,8 +2931,8 @@ static PyObject *BPy_StringProperty(PyObject *self, PyObject *args, PyObject *kw prop = RNA_def_property(srna, id, PROP_STRING, subtype); if (maxlen != 0) { - RNA_def_property_string_maxlength(prop, - maxlen + 1); /* +1 since it includes null terminator */ + /* +1 since it includes null terminator. */ + RNA_def_property_string_maxlength(prop, maxlen + 1); } if (def && def[0]) { RNA_def_property_string_default(prop, def); diff --git a/source/blender/python/intern/bpy_rna_anim.c b/source/blender/python/intern/bpy_rna_anim.c index fb9454bf108..7a3499d0295 100644 --- a/source/blender/python/intern/bpy_rna_anim.c +++ b/source/blender/python/intern/bpy_rna_anim.c @@ -455,8 +455,8 @@ PyObject *pyrna_struct_keyframe_delete(BPy_StructRNA *self, PyObject *args, PyOb NlaStrip *strip = (NlaStrip *)ptr.data; FCurve *fcu = list_find_fcurve(&strip->fcurves, RNA_property_identifier(prop), index); - BLI_assert(fcu != - NULL); /* NOTE: This should be true, or else we wouldn't be able to get here */ + /* NOTE: This should be true, or else we wouldn't be able to get here. */ + BLI_assert(fcu != NULL); if (BKE_fcurve_is_protected(fcu)) { BKE_reportf( diff --git a/source/blender/python/intern/bpy_rna_array.c b/source/blender/python/intern/bpy_rna_array.c index 9d8fff5dfe4..a8312d89ef8 100644 --- a/source/blender/python/intern/bpy_rna_array.c +++ b/source/blender/python/intern/bpy_rna_array.c @@ -554,8 +554,9 @@ static int py_to_array(PyObject *seq, /* not freeing allocated mem, RNA_parameter_list_free() will do this */ ParameterDynAlloc *param_alloc = (ParameterDynAlloc *)param_data; param_alloc->array_tot = (int)totitem; - param_alloc->array = MEM_callocN(item_size * totitem, - "py_to_array dyn"); /* freeing param list will free */ + + /* freeing param list will free */ + param_alloc->array = MEM_callocN(item_size * totitem, "py_to_array dyn"); data = param_alloc->array; } diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index c9d0dee044f..70bd3a64481 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -96,16 +96,16 @@ int EXPP_VectorsAreEqual(const float *vecA, const float *vecB, int size, int flo typedef struct Mathutils_Callback Mathutils_Callback; -typedef int (*BaseMathCheckFunc)(BaseMathObject *); /* checks the user is still valid */ -typedef int (*BaseMathGetFunc)(BaseMathObject *, int); /* gets the vector from the user */ -typedef int (*BaseMathSetFunc)(BaseMathObject *, - int); /* sets the users vector values once its modified */ -typedef int (*BaseMathGetIndexFunc)(BaseMathObject *, - int, - int); /* same as above but only for an index */ -typedef int (*BaseMathSetIndexFunc)(BaseMathObject *, - int, - int); /* same as above but only for an index */ +/** Checks the user is still valid. */ +typedef int (*BaseMathCheckFunc)(BaseMathObject *); +/** Gets the vector from the user. */ +typedef int (*BaseMathGetFunc)(BaseMathObject *, int); +/** Sets the users vector values once its modified. */ +typedef int (*BaseMathSetFunc)(BaseMathObject *, int); +/** Same as above but only for an index. */ +typedef int (*BaseMathGetIndexFunc)(BaseMathObject *, int, int); +/** Same as above but only for an index. */ +typedef int (*BaseMathSetIndexFunc)(BaseMathObject *, int, int); struct Mathutils_Callback { BaseMathCheckFunc check; |