Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-29 17:49:21 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-29 17:49:21 +0300
commite28e6ac5c78d6f02e43132f9f5d23288f151be12 (patch)
tree0254692a5193e5605f6a7a903cc5c152e8b5218f /source/blender/python/intern/bpy_rna.c
parent5abb38e566774054f586fd4ac6a1d42c951d3213 (diff)
Fix the underlying problem from the last commit, which was worked
around incorrectly in r24435 before that. freeptr in BPy_StructRNA was uninitialized when creating bpy.context.
Diffstat (limited to 'source/blender/python/intern/bpy_rna.c')
-rw-r--r--source/blender/python/intern/bpy_rna.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 9e34da1dde7..49dfa95109c 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -370,13 +370,9 @@ static long pyrna_struct_hash( BPy_StructRNA *self )
static void pyrna_struct_dealloc( BPy_StructRNA *self )
{
if (self->freeptr && self->ptr.data) {
-
- if (self->ptr.type != &RNA_Context)
- {
- IDP_FreeProperty(self->ptr.data);
- MEM_freeN(self->ptr.data);
- self->ptr.data= NULL;
- }
+ IDP_FreeProperty(self->ptr.data);
+ MEM_freeN(self->ptr.data);
+ self->ptr.data= NULL;
}
/* Note, for subclassed PyObjects we cant just call PyObject_DEL() directly or it will crash */