diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-25 12:20:19 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-03-25 12:20:19 +0400 |
commit | 3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77 (patch) | |
tree | b3fdb366cb49bdea5b57dfa6ba4a82635c68d0ee /source/blender/python/intern/gpu.c | |
parent | a2ebfc82dbe954acc432ae017ac62a30a11b6a16 (diff) | |
parent | e99a23fc6b33b5097eab44aac19c2a089ddebce6 (diff) |
Merged changes in the trunk up to revision 45133.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
Diffstat (limited to 'source/blender/python/intern/gpu.c')
-rw-r--r-- | source/blender/python/intern/gpu.c | 26 |
1 files changed, 13 insertions, 13 deletions
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); |