[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23244] trunk/blender/source/blender: - opening the file selector was freeing a NULL pointer
Campbell Barton
ideasman42 at gmail.com
Tue Sep 15 12:52:42 CEST 2009
Revision: 23244
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23244
Author: campbellbarton
Date: 2009-09-15 12:52:36 +0200 (Tue, 15 Sep 2009)
Log Message:
-----------
- opening the file selector was freeing a NULL pointer
- some warnings in last commit.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_file/space_file.c
trunk/blender/source/blender/python/intern/bpy_rna.c
Modified: trunk/blender/source/blender/editors/space_file/space_file.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/space_file.c 2009-09-15 10:26:36 UTC (rev 23243)
+++ trunk/blender/source/blender/editors/space_file/space_file.c 2009-09-15 10:52:36 UTC (rev 23244)
@@ -156,8 +156,10 @@
static void file_init(struct wmWindowManager *wm, ScrArea *sa)
{
SpaceFile *sfile= (SpaceFile*)sa->spacedata.first;
- MEM_freeN(sfile->params);
- sfile->params = 0;
+ if(sfile->params) {
+ MEM_freeN(sfile->params);
+ sfile->params = 0;
+ }
printf("file_init\n");
}
Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c 2009-09-15 10:26:36 UTC (rev 23243)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c 2009-09-15 10:52:36 UTC (rev 23244)
@@ -1680,6 +1680,7 @@
{
/* Try get values from a collection */
PyObject *ret;
+ PyObject *iter;
if(RNA_property_array_check(&self->ptr, self->prop)) {
int len = pyrna_prop_array_length(self);
@@ -1691,7 +1692,7 @@
PyList_SET_ITEM(ret, i, pyrna_prop_to_py_index(self, i));
}
}
- else if (ret = pyrna_prop_values(self)) {
+ else if ((ret = pyrna_prop_values(self))) {
/* do nothing */
}
else {
@@ -1701,7 +1702,7 @@
/* we know this is a list so no need to PyIter_Check */
- PyObject *iter = PyObject_GetIter(ret);
+ iter = PyObject_GetIter(ret);
Py_DECREF(ret);
return iter;
}
More information about the Bf-blender-cvs
mailing list