diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 11:02:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 11:06:31 +0300 |
| commit | 74dc4e87a6df2826f26eb94eaff8fe02a3911c24 (patch) | |
| tree | 464f333495b9836e71631629c863bbc8afc4374f /source/blender/blenkernel/intern/object.c | |
| parent | c9e5e81064d4ce4863d113ea5dc3773500f01d7d (diff) | |
Fix Buttons context, invalid object data access
Another instance of T44376.
Crash where the Python context would access a stale pointer to the active object.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 111aa84e688..bd0b7275174 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -808,25 +808,11 @@ void BKE_object_unlink(Object *ob) } } } - else if (sl->spacetype == SPACE_OUTLINER) { +#if 0 + else if (ELEM(sl->spacetype, SPACE_OUTLINER, SPACE_BUTS, SPACE_NODE)) { /* now handled by WM_main_remove_editor_id_reference */ } - else if (sl->spacetype == SPACE_BUTS) { - SpaceButs *sbuts = (SpaceButs *)sl; - - if (sbuts->pinid == (ID *)ob) { - sbuts->flag &= ~SB_PIN_CONTEXT; - sbuts->pinid = NULL; - } - } - else if (sl->spacetype == SPACE_NODE) { - SpaceNode *snode = (SpaceNode *)sl; - - if (snode->from == (ID *)ob) { - snode->flag &= ~SNODE_PIN; - snode->from = NULL; - } - } +#endif } sa = sa->next; |