diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-22 14:09:36 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-02-22 14:16:29 +0300 |
commit | 20104beea7d3bbcc32108fae935270503c251e54 (patch) | |
tree | e5f1ac293a7a44ec54f44af86e274c07f3de6015 /source/blender/editors/object/object_add.c | |
parent | 9cfc203749c3a2534d0b71fccf645eb4406ef228 (diff) |
Fix T47482: take II, restore 2.76 behavior regarding groups when deleting an object.
Also re-reported through IRC by Thomas Beck (@plasmasolutions), thanks.
Though it's not ideal in theory, we have quite poor handling of object datablock currently
from user PoV - before this commit, it was not easily possible to get fully rid of an object
anymore if you did not removed it from all its groups before deleting it.
So for now, restore 2.76 behavior (namely, unlink an object from avaerything in Blender
once it is no more used by any scene).
Better handling of all this is TODO for later (also related to much more heavy changes
done in id-remap branch regarding sanitizing our ID deletion process).
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r-- | source/blender/editors/object/object_add.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 57d16d3104b..88ab3450b04 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -1151,7 +1151,6 @@ static int object_delete_exec(bContext *C, wmOperator *op) } } /* end global */ - } CTX_DATA_END; @@ -1159,7 +1158,7 @@ static int object_delete_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* delete has to handle all open scenes */ - BKE_main_id_tag_listbase(&bmain->scene, LIB_TAG_DOIT, 1); + BKE_main_id_tag_listbase(&bmain->scene, LIB_TAG_DOIT, true); for (win = wm->windows.first; win; win = win->next) { scene = win->screen->scene; |