diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 19:47:05 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-09-19 19:47:05 +0400 |
commit | 8dbc7a3ba321ce545c5ebfaa306c62314a38ff48 (patch) | |
tree | 7dc24b3605617c69022bccf6cd87521379626ac1 /source/blender/python/generic | |
parent | 8961f24425954c7f6fcaed94f6b0c776a00719ea (diff) | |
parent | d78231734d6ccf224738ea76307c26f8c0d4dab4 (diff) |
Merging r40345 through r40365 from trunk into soc-2011-garlic
Diffstat (limited to 'source/blender/python/generic')
-rw-r--r-- | source/blender/python/generic/bgl.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c index ae8069cf3c5..44d42a479ec 100644 --- a/source/blender/python/generic/bgl.c +++ b/source/blender/python/generic/bgl.c @@ -61,9 +61,9 @@ static PySequenceMethods Buffer_SeqMethods = { (binaryfunc) NULL, /*sq_concat */ (ssizeargfunc) NULL, /*sq_repeat */ (ssizeargfunc) Buffer_item, /*sq_item */ - (ssizessizeargfunc) Buffer_slice, /*sq_slice, deprecated TODO, replace */ + (ssizessizeargfunc) NULL, /*sq_slice, deprecated, handled in Buffer_item */ (ssizeobjargproc) Buffer_ass_item, /*sq_ass_item */ - (ssizessizeobjargproc) Buffer_ass_slice, /*sq_ass_slice, deprecated TODO, replace */ + (ssizessizeobjargproc) NULL, /*sq_ass_slice, deprecated handled in Buffer_ass_item */ (objobjproc) NULL, /* sq_contains */ (binaryfunc) NULL, /* sq_inplace_concat */ (ssizeargfunc) NULL, /* sq_inplace_repeat */ @@ -112,13 +112,6 @@ static PyObject *Buffer_to_list_recursive(Buffer *self) return list; } -/* *DEPRECATED* 2011/7/17 bgl.Buffer.list */ -static PyObject *Buffer_list(Buffer *self, void *UNUSED(arg)) -{ - fprintf(stderr, "Warning: 'Buffer.list' deprecated, use '[:]' instead\n"); - return Buffer_to_list(self); -} - static PyObject *Buffer_dimensions(Buffer *self, void *UNUSED(arg)) { PyObject *list= PyList_New(self->ndimensions); @@ -138,7 +131,6 @@ static PyMethodDef Buffer_methods[] = { }; static PyGetSetDef Buffer_getseters[] = { - {(char *)"list", (getter)Buffer_list, NULL, NULL, NULL}, {(char *)"dimensions", (getter)Buffer_dimensions, NULL, NULL, NULL}, {NULL, NULL, NULL, NULL, NULL} }; |