[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40071] trunk/blender/source/blender/ python/intern/gpu.c: warning fixes

Campbell Barton ideasman42 at gmail.com
Fri Sep 9 15:46:47 CEST 2011


Revision: 40071
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40071
Author:   campbellbarton
Date:     2011-09-09 13:46:47 +0000 (Fri, 09 Sep 2011)
Log Message:
-----------
warning fixes

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/gpu.c

Modified: trunk/blender/source/blender/python/intern/gpu.c
===================================================================
--- trunk/blender/source/blender/python/intern/gpu.c	2011-09-09 13:42:22 UTC (rev 40070)
+++ trunk/blender/source/blender/python/intern/gpu.c	2011-09-09 13:46:47 UTC (rev 40071)
@@ -47,7 +47,10 @@
 #include "DNA_object_types.h"
 #include "DNA_ID.h"
 #include "DNA_customdata_types.h"
+
 #include "BLI_listbase.h"
+#include "BLI_utildefines.h"
+
 #include "RNA_access.h"
 
 #include "bpy_rna.h"
@@ -138,7 +141,7 @@
 	PyObject_SetAttrString(d, #f, val);	\
 	Py_DECREF(val)
 
-static PyObject* GPU_export_shader(PyObject* self, PyObject *args, PyObject *kwds)
+static PyObject* GPU_export_shader(PyObject* UNUSED(self), PyObject *args, PyObject *kwds)
 {
 	PyObject* pyscene;
 	PyObject* pymat;
@@ -238,7 +241,7 @@
 			PY_DICT_ADD_LONG(dict,uniform,texnumber);
 		}
 		if (uniform->texpixels) {
-			val = PyByteArray_FromStringAndSize(uniform->texpixels, uniform->texsize);
+			val = PyByteArray_FromStringAndSize((const char *)uniform->texpixels, uniform->texsize);
 			PyDict_SetItemString(dict, "texpixels", val);
 			Py_DECREF(val);
 			PY_DICT_ADD_LONG(dict,uniform,texsize);
@@ -280,7 +283,7 @@
 										  ":return: Dictionary defining the shader, uniforms and attributes.\n"
 										  ":rtype: Dict"}};
 
-PyObject* GPU_initPython()
+PyObject* GPU_initPython(void)
 {
 	PyObject* module = PyInit_gpu();
 	PyModule_AddObject(module, "export_shader", (PyObject *)PyCFunction_New(meth_export_shader, NULL));




More information about the Bf-blender-cvs mailing list