diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-10-13 23:56:53 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2010-10-13 23:56:53 +0400 |
| commit | 32ac21ab023ad90d994bac6a76aba0fa2da88176 (patch) | |
| tree | 724d1b972aaacb8e71b30fbaf85f045a3a86744f | |
| parent | 9f05cc59fab2cd3e82be759e46bf4dacd2dbad05 (diff) | |
Fix #24234: Object deletion doesn't take into account its users (causes segfault)
Clear SELECT flag when deleting object -- object could be used in other scenes, and
some stuff (like translation) would be confused due to relations
| -rw-r--r-- | source/blender/editors/object/object_add.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 3ae1941035d..8661cbc680a 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -817,6 +817,10 @@ static int object_delete_exec(bContext *C, wmOperator *op) CTX_DATA_BEGIN(C, Base*, base, selected_bases) { if(base->object->type==OB_LAMP) islamp= 1; + + /* deselect object -- it could be used in other scenes */ + base->object->flag &= ~SELECT; + /* remove from current scene only */ ED_base_object_free_and_unlink(bmain, scene, base); } |