From c7c162e2e0261dd007d613249cc1acfed1d701ac Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 19 Apr 2017 22:13:57 +0200 Subject: [PATCH] Fix merge of master (no more base...). --- source/blender/editors/object/object_add.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 410a3fecbf0..d860ce3d5e9 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1162,9 +1162,9 @@ static int object_delete_exec(bContext *C, wmOperator *op) * custom scene/object/base handling, and use generic lib remap/query for that. * But this is for later (aka 2.8, once layers & co are settled and working). */ - if (use_global && base->object->id.lib == NULL) { + if (use_global && ob->id.lib == NULL) { /* We want to nuke the object, let's nuke it the easy way (not for linked data though)... */ - BKE_libblock_delete(bmain, &base->object->id); + BKE_libblock_delete(bmain, &ob->id); changed = true; continue; }