griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

bugfix [#22561] Make Dupliface Memory Leak

Browse Source
This commit is contained in:
Campbell Barton
2010-06-10 18:56:52 +00:00
parent 7e21cede8f
commit ac59cad93f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/makesrna/intern/rna_scene.c
View File

@@ -212,15 +212,20 @@ static void rna_Scene_object_unlink(Scene *scene, ReportList *reports, Object *o
{
Base *base= object_in_scene(ob, scene);
if (!base) {
BKE_report(reports, RPT_ERROR, "Object is not in this scene.");
BKE_reportf(reports, RPT_ERROR, "Object '%s' is not in this scene '%s'.", ob->id.name+2, scene->id.name+2);
return;
}
if (base==scene->basact && ob->mode != OB_MODE_OBJECT) {
BKE_report(reports, RPT_ERROR, "Object must be in 'Object Mode' to unlink.");
BKE_reportf(reports, RPT_ERROR, "Object '%s' must be in 'Object Mode' to unlink.", ob->id.name+2);
return;
}
if(scene->basact==base) {
scene->basact= NULL;
}
BLI_remlink(&scene->base, base);
MEM_freeN(base);
ob->id.us--;
/* needed otherwise the depgraph will contain free'd objects which can crash, see [#20958] */