Merging r50602 through r50617 form trunk into soc-2011-tomato

2012-09-15 06:24:48 +00:00
parent a803f5d6d0
commit beba8014e4
106 changed files with 918 additions and 728 deletions
--- a/source/blender/python/intern/gpu.c
+++ b/source/blender/python/intern/gpu.c
@@ -74,8 +74,7 @@ static struct PyModuleDef gpumodule = {
 	NULL, NULL, NULL, NULL, NULL
 };

-PyMODINIT_FUNC
-PyInit_gpu(void)
+static PyObject *PyInit_gpu(void)
 {
 	PyObject *m;