archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

*warnings fixes

Browse Source
This commit is contained in:
Joseph Gilbert
2005-12-13 14:29:56 +00:00
parent 5fa5392b04
commit 7bba26d24b
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/python/api2_2x/Image.c
View File

@@ -101,10 +101,10 @@ returns None if not found.\n";
struct PyMethodDef M_Image_methods[] = { struct PyMethodDef M_Image_methods[] = {
/*{"New", ( PyCFunction ) M_Image_New, METH_VARARGS | METH_KEYWORDS, /*{"New", ( PyCFunction ) M_Image_New, METH_VARARGS | METH_KEYWORDS,
M_Image_New_doc}, */ M_Image_New_doc}, */
{"Get", M_Image_Get, METH_VARARGS, M_Image_Get_doc}, {"Get", (PyCFunction) M_Image_Get, METH_VARARGS, M_Image_Get_doc},
{"GetCurrent", M_Image_GetCurrent, METH_NOARGS, M_Image_GetCurrent_doc}, {"GetCurrent", (PyCFunction) M_Image_GetCurrent, METH_NOARGS, M_Image_GetCurrent_doc},
{"get", M_Image_Get, METH_VARARGS, M_Image_Get_doc}, {"get", (PyCFunction) M_Image_Get, METH_VARARGS, M_Image_Get_doc},
{"Load", M_Image_Load, METH_VARARGS, M_Image_Load_doc}, {"Load", (PyCFunction) M_Image_Load, METH_VARARGS, M_Image_Load_doc},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };

1
source/blender/python/api2_2x/Library.c
View File

@@ -42,6 +42,7 @@
#include "BKE_utildefines.h" #include "BKE_utildefines.h"
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BLI_blenlib.h"
#include "BLO_readfile.h" #include "BLO_readfile.h"
#include "BLI_linklist.h" #include "BLI_linklist.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"

32
source/blender/python/api2_2x/sceneTimeLine.c
View File

@@ -191,35 +191,41 @@ static PyObject *TimeLine_getFramesMarked (BPy_TimeLine *self, PyObject *args) {
"expected nothing, string or int as arguments."); "expected nothing, string or int as arguments.");
if (frm>0) { if (frm>0) {
marker_dict= PyDict_New (); marker_dict= PyDict_New ();
for (marker_it= self->marker_list->first; marker_it; marker_it= marker_it->next) for (marker_it= self->marker_list->first; marker_it; marker_it= marker_it->next){
if (marker_it->frame==frm) { if (marker_it->frame==frm) {
if ((pyo= PyDict_GetItem ((PyObject*)marker_dict, PyInt_FromLong ((long int)marker_it->frame))) ) { pyo= PyDict_GetItem ((PyObject*)marker_dict, PyInt_FromLong ((long int)marker_it->frame));
if (pyo) {
PyList_Append (pyo, PyString_FromString (marker_it->name)); PyList_Append (pyo, PyString_FromString (marker_it->name));
Py_INCREF (pyo); Py_INCREF (pyo);
} }else{
else { pyo = PyList_New (0);
if (!pyo) pyo= PyList_New (0);
PyList_Append (pyo, PyString_FromString (marker_it->name)); PyList_Append (pyo, PyString_FromString (marker_it->name));
} }
PyDict_SetItem (marker_dict, PyInt_FromLong ((long int)marker_it->frame), pyo); PyDict_SetItem (marker_dict, PyInt_FromLong ((long int)marker_it->frame), pyo);
if (pyo) { Py_DECREF (pyo); pyo= NULL; } if (pyo) {
Py_DECREF (pyo);
pyo= NULL;
}
} }
}
} }
} }else {
else {
marker_dict= PyDict_New (); marker_dict= PyDict_New ();
for (marker_it= self->marker_list->first; marker_it; marker_it= marker_it->next) { for (marker_it= self->marker_list->first; marker_it; marker_it= marker_it->next) {
if ((pyo=PyDict_GetItem ((PyObject*)marker_dict, PyInt_FromLong ((long int)marker_it->frame))) ) { pyo=PyDict_GetItem ((PyObject*)marker_dict, PyInt_FromLong ((long int)marker_it->frame));
if (pyo) {
PyList_Append (pyo, PyString_FromString (marker_it->name)); PyList_Append (pyo, PyString_FromString (marker_it->name));
Py_INCREF (pyo); Py_INCREF (pyo);
} }else{
else { pyo= PyList_New (0);
if (!pyo) pyo= PyList_New (0);
PyList_Append (pyo, PyString_FromString (marker_it->name)); PyList_Append (pyo, PyString_FromString (marker_it->name));
} }
PyDict_SetItem (marker_dict, PyInt_FromLong ((long int)marker_it->frame), pyo); PyDict_SetItem (marker_dict, PyInt_FromLong ((long int)marker_it->frame), pyo);
if (pyo) { Py_DECREF (pyo); pyo= NULL; } if (pyo) {
Py_DECREF (pyo);
pyo= NULL;
}
} }
} }