fix for referencing freed memory when freeing an rna property.

1 files changed, 4 insertions, 2 deletions

diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index d89d0ad5d29..6080d02a1c7 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -2728,14 +2728,16 @@ void RNA_def_property_free(StructOrFunctionRNA *cont_, PropertyRNA *prop)
 {
 	ContainerRNA *cont= cont_;
 	
-	RNA_def_property_free_pointers(prop);
-	
 	if(prop->flag & PROP_RUNTIME) {
 		if(cont->prophash)
 			BLI_ghash_remove(cont->prophash, (void*)prop->identifier, NULL, NULL);
 
+		RNA_def_property_free_pointers(prop);
 		rna_freelinkN(&cont->properties, prop);
 	}
+	else {
+		RNA_def_property_free_pointers(prop);
+	}
 }
 
 /* note: only intended for removing dynamic props */