Revision: 44928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44928
Author: campbellbarton
Date: 2012-03-16 21:39:56 +0000 (Fri, 16 Mar 2012)
Log Message:
-----------
style cleanup: py/capi
Modified Paths:
--------------
trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c
trunk/blender/source/blender/python/generic/bgl.c
trunk/blender/source/blender/python/generic/bgl.h
trunk/blender/source/blender/python/generic/blf_py_api.c
trunk/blender/source/blender/python/generic/bpy_internal_import.c
trunk/blender/source/blender/python/generic/idprop_py_api.c
trunk/blender/source/blender/python/generic/py_capi_utils.c
trunk/blender/source/blender/python/intern/bpy_app_handlers.c
trunk/blender/source/blender/python/intern/bpy_interface.c
trunk/blender/source/blender/python/intern/bpy_library.c
trunk/blender/source/blender/python/intern/bpy_props.c
trunk/blender/source/blender/python/intern/bpy_rna.c
trunk/blender/source/blender/python/intern/bpy_rna_array.c
trunk/blender/source/blender/python/intern/bpy_traceback.c
trunk/blender/source/blender/python/intern/gpu.c
trunk/blender/source/blender/python/intern/gpu.h
trunk/blender/source/blender/python/mathutils/mathutils.c
trunk/blender/source/blender/python/mathutils/mathutils.h
trunk/blender/source/blender/python/mathutils/mathutils_Color.c
trunk/blender/source/blender/python/mathutils/mathutils_Color.h
trunk/blender/source/blender/python/mathutils/mathutils_Euler.c
trunk/blender/source/blender/python/mathutils/mathutils_Euler.h
trunk/blender/source/blender/python/mathutils/mathutils_Matrix.c
trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.c
trunk/blender/source/blender/python/mathutils/mathutils_Quaternion.h
trunk/blender/source/blender/python/mathutils/mathutils_Vector.c
trunk/blender/source/blender/python/mathutils/mathutils_geometry.c
trunk/blender/source/blender/python/mathutils/mathutils_noise.c
trunk/blender/source/blender/python/simple_enum_gen.py
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_api.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_api.c 2012-03-16
21:26:18 UTC (rev 44927)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_api.c 2012-03-16
21:39:56 UTC (rev 44928)
@@ -137,11 +137,11 @@
mod = PyModule_Create(&BPy_BM_module_def);
/* bmesh.types */
- PyModule_AddObject(mod, "types", (submodule=BPyInit_bmesh_types()));
+ PyModule_AddObject(mod, "types", (submodule = BPyInit_bmesh_types()));
PyDict_SetItemString(sys_modules, "bmesh.types", submodule);
Py_INCREF(submodule);
- PyModule_AddObject(mod, "utils", (submodule=BPyInit_bmesh_utils()));
+ PyModule_AddObject(mod, "utils", (submodule = BPyInit_bmesh_utils()));
PyDict_SetItemString(sys_modules, "bmesh.utils", submodule);
Py_INCREF(submodule);
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-03-16
21:26:18 UTC (rev 44927)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types.c 2012-03-16
21:39:56 UTC (rev 44928)
@@ -721,8 +721,8 @@
);
static PyObject *bpy_bmesh_to_mesh(BPy_BMesh *self, PyObject *args)
{
- PyObject *py_mesh;
- Mesh *me;
+ PyObject *py_mesh;
+ Mesh *me;
BMesh *bm;
BPY_BM_CHECK_OBJ(self);
@@ -764,8 +764,8 @@
);
static PyObject *bpy_bmesh_from_object(BPy_BMesh *self, PyObject *args)
{
- PyObject *py_object;
- Object *ob;
+ PyObject *py_object;
+ Object *ob;
BMesh *bm;
int apply_modifiers = TRUE;
DerivedMesh *dm;
@@ -1659,7 +1659,7 @@
edge_array = (BMEdge **)PyMem_MALLOC(vert_seq_len *
sizeof(BMEdge **));
/* ensure edges */
- for (i = vert_seq_len - 1, i_next = 0; i_next < vert_seq_len;
(i=i_next++)) {
+ for (i = vert_seq_len - 1, i_next = 0; i_next < vert_seq_len;
(i = i_next++)) {
edge_array[i] = BM_edge_create(bm, vert_array[i],
vert_array[i_next], NULL, TRUE);
}
Modified: trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c
===================================================================
--- trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c
2012-03-16 21:26:18 UTC (rev 44927)
+++ trunk/blender/source/blender/python/bmesh/bmesh_py_types_customdata.c
2012-03-16 21:39:56 UTC (rev 44928)
@@ -244,7 +244,7 @@
static PyObject *bpy_bmlayercollection_get(BPy_BMLayerCollection *self,
PyObject *args)
{
const char *key;
- PyObject* def = Py_None;
+ PyObject *def = Py_None;
BPY_BM_CHECK_OBJ(self);
Modified: trunk/blender/source/blender/python/generic/bgl.c
===================================================================
--- trunk/blender/source/blender/python/generic/bgl.c 2012-03-16 21:26:18 UTC
(rev 44927)
+++ trunk/blender/source/blender/python/generic/bgl.c 2012-03-16 21:39:56 UTC
(rev 44928)
@@ -80,10 +80,10 @@
static PyObject *Buffer_to_list(Buffer *self)
{
- int i, len= self->dimensions[0];
- PyObject *list= PyList_New(len);
+ int i, len = self->dimensions[0];
+ PyObject *list = PyList_New(len);
- for (i=0; i<len; i++) {
+ for (i = 0; i < len; i++) {
PyList_SET_ITEM(list, i, Buffer_item(self, i));
}
@@ -95,17 +95,17 @@
PyObject *list;
if (self->ndimensions > 1) {
- int i, len= self->dimensions[0];
- list= PyList_New(len);
+ int i, len = self->dimensions[0];
+ list = PyList_New(len);
- for (i=0; i<len; i++) {
- Buffer *sub= (Buffer *)Buffer_item(self, i);
+ for (i = 0; i < len; i++) {
+ Buffer *sub = (Buffer *)Buffer_item(self, i);
PyList_SET_ITEM(list, i, Buffer_to_list_recursive(sub));
Py_DECREF(sub);
}
}
else {
- list= Buffer_to_list(self);
+ list = Buffer_to_list(self);
}
return list;
@@ -113,10 +113,10 @@
static PyObject *Buffer_dimensions(Buffer *self, void *UNUSED(arg))
{
- PyObject *list= PyList_New(self->ndimensions);
+ PyObject *list = PyList_New(self->ndimensions);
int i;
- for (i= 0; i<self->ndimensions; i++) {
+ for (i = 0; i < self->ndimensions; i++) {
PyList_SET_ITEM(list, i, PyLong_FromLong(self->dimensions[i]));
}
@@ -239,16 +239,16 @@
int BGL_typeSize(int type)
{
switch (type) {
- case GL_BYTE:
- return sizeof(char);
- case GL_SHORT:
- return sizeof(short);
- case GL_INT:
- return sizeof(int);
- case GL_FLOAT:
- return sizeof(float);
- case GL_DOUBLE:
- return sizeof(double);
+ case GL_BYTE:
+ return sizeof(char);
+ case GL_SHORT:
+ return sizeof(short);
+ case GL_INT:
+ return sizeof(int);
+ case GL_FLOAT:
+ return sizeof(float);
+ case GL_DOUBLE:
+ return sizeof(double);
}
return -1;
}
@@ -256,30 +256,31 @@
Buffer *BGL_MakeBuffer(int type, int ndimensions, int *dimensions, void
*initbuffer)
{
Buffer *buffer;
- void *buf= NULL;
+ void *buf = NULL;
int i, size, length;
-
- length= 1;
- for (i=0; i<ndimensions; i++)
- length*= dimensions[i];
-
- size= BGL_typeSize(type);
-
- buf= MEM_mallocN(length*size, "Buffer buffer");
- buffer= (Buffer *) PyObject_NEW(Buffer, &BGL_bufferType);
- buffer->parent= NULL;
- buffer->ndimensions= ndimensions;
- buffer->dimensions= MEM_mallocN(ndimensions*sizeof(int), "Buffer
dimensions");
- memcpy(buffer->dimensions, dimensions, ndimensions*sizeof(int));
- buffer->type= type;
- buffer->buf.asvoid= buf;
+ length = 1;
+ for (i = 0; i < ndimensions; i++) {
+ length *= dimensions[i];
+ }
+ size = BGL_typeSize(type);
+
+ buf = MEM_mallocN(length * size, "Buffer buffer");
+
+ buffer = (Buffer *)PyObject_NEW(Buffer, &BGL_bufferType);
+ buffer->parent = NULL;
+ buffer->ndimensions = ndimensions;
+ buffer->dimensions = MEM_mallocN(ndimensions * sizeof(int), "Buffer
dimensions");
+ memcpy(buffer->dimensions, dimensions, ndimensions * sizeof(int));
+ buffer->type = type;
+ buffer->buf.asvoid = buf;
+
if (initbuffer) {
- memcpy(buffer->buf.asvoid, initbuffer, length*size);
+ memcpy(buffer->buf.asvoid, initbuffer, length * size);
}
else {
- memset(buffer->buf.asvoid, 0, length*size);
+ memset(buffer->buf.asvoid, 0, length * size);
}
return buffer;
}
@@ -288,10 +289,10 @@
#define MAX_DIMENSIONS 256
static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args,
PyObject *kwds)
{
- PyObject *length_ob= NULL, *init= NULL;
+ PyObject *length_ob = NULL, *init = NULL;
Buffer *buffer;
int dimensions[MAX_DIMENSIONS];
-
+
int type;
Py_ssize_t i, ndimensions = 0;
@@ -312,15 +313,15 @@
}
if (PyLong_Check(length_ob)) {
- ndimensions= 1;
- if (((dimensions[0]= PyLong_AsLong(length_ob)) < 1)) {
+ ndimensions = 1;
+ if (((dimensions[0] = PyLong_AsLong(length_ob)) < 1)) {
PyErr_SetString(PyExc_AttributeError,
"dimensions must be between 1 and
"STRINGIFY(MAX_DIMENSIONS));
return NULL;
}
}
else if (PySequence_Check(length_ob)) {
- ndimensions= PySequence_Size(length_ob);
+ ndimensions = PySequence_Size(length_ob);
if (ndimensions > MAX_DIMENSIONS) {
PyErr_SetString(PyExc_AttributeError,
"too many dimensions, max is
"STRINGIFY(MAX_DIMENSIONS));
@@ -331,11 +332,13 @@
"sequence must have at least one
dimension");
return NULL;
}
- for (i=0; i<ndimensions; i++) {
- PyObject *ob= PySequence_GetItem(length_ob, i);
+ for (i = 0; i < ndimensions; i++) {
+ PyObject *ob = PySequence_GetItem(length_ob, i);
- if (!PyLong_Check(ob)) dimensions[i]= 1;
- else dimensions[i]= PyLong_AsLong(ob);
+ if (!PyLong_Check(ob))
+ dimensions[i] = 1;
+ else
+ dimensions[i] = PyLong_AsLong(ob);
Py_DECREF(ob);
if (dimensions[i] < 1) {
@@ -351,16 +354,16 @@
"or an int, not a %.200s",
Py_TYPE(length_ob)->tp_name);
return NULL;
}
-
- buffer= BGL_MakeBuffer(type, ndimensions, dimensions, NULL);
+
+ buffer = BGL_MakeBuffer(type, ndimensions, dimensions, NULL);
if (init && ndimensions) {
if (Buffer_ass_slice(buffer, 0, dimensions[0], init)) {
Py_DECREF(buffer);
return NULL;
}
}
-
- return (PyObject *) buffer;
+
+ return (PyObject *)buffer;
}
/*@ Buffer sequence methods */
@@ -377,12 +380,12 @@
return NULL;
}
- if (self->ndimensions==1) {
+ if (self->ndimensions == 1) {
switch (self->type) {
- case GL_BYTE: return Py_BuildValue("b",
self->buf.asbyte[i]);
- case GL_SHORT: return Py_BuildValue("h",
self->buf.asshort[i]);
- case GL_INT: return Py_BuildValue("i",
self->buf.asint[i]);
- case GL_FLOAT: return
PyFloat_FromDouble(self->buf.asfloat[i]);
+ case GL_BYTE: return Py_BuildValue("b",
self->buf.asbyte[i]);
+ case GL_SHORT: return Py_BuildValue("h",
self->buf.asshort[i]);
+ case GL_INT: return Py_BuildValue("i",
self->buf.asint[i]);
+ case GL_FLOAT: return
PyFloat_FromDouble(self->buf.asfloat[i]);
case GL_DOUBLE: return Py_BuildValue("d",
self->buf.asdouble[i]);
}
}
@@ -390,26 +393,24 @@
Buffer *newbuf;
int j, length, size;
- length= 1;
- for (j=1; j < self->ndimensions; j++) {
+ length = 1;
+ for (j = 1; j < self->ndimensions; j++) {
length *= self->dimensions[j];
}
- size= BGL_typeSize(self->type);
+ size = BGL_typeSize(self->type);
- newbuf= (Buffer *) PyObject_NEW(Buffer, &BGL_bufferType);
+ newbuf = (Buffer *)PyObject_NEW(Buffer, &BGL_bufferType);
Py_INCREF(self);
- newbuf->parent= (PyObject *)self;
+ newbuf->parent = (PyObject *)self;
- newbuf->ndimensions= self->ndimensions - 1;
- newbuf->type= self->type;
- newbuf->buf.asvoid= self->buf.asbyte + i*length*size;
- newbuf->dimensions= MEM_mallocN(newbuf->ndimensions*sizeof(int),
- "Buffer dimensions");
- memcpy(newbuf->dimensions, self->dimensions+1,
- newbuf->ndimensions*sizeof(int));
+ newbuf->ndimensions = self->ndimensions - 1;
+ newbuf->type = self->type;
+ newbuf->buf.asvoid = self->buf.asbyte + i * length * size;
+ newbuf->dimensions = MEM_mallocN(newbuf->ndimensions *
sizeof(int), "Buffer dimensions");
+ memcpy(newbuf->dimensions, self->dimensions + 1,
newbuf->ndimensions * sizeof(int));
- return (PyObject *) newbuf;
+ return (PyObject *)newbuf;
}
return NULL;
@@ -420,13 +421,13 @@
PyObject *list;
int count;
- if (begin < 0) begin= 0;
- if (end > self->dimensions[0]) end= self->dimensions[0];
- if (begin > end) begin= end;
+ if (begin < 0) begin = 0;
+ if (end > self->dimensions[0]) end = self->dimensions[0];
+ if (begin > end) begin = end;
- list= PyList_New(end-begin);
+ list = PyList_New(end - begin);
- for (count= begin; count<end; count++) {
+ for (count = begin; count < end; count++) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
