From 29b402f376716ba77f254eac4a214cda52e60608 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 25 Jun 2010 11:41:39 +0000 Subject: [PATCH] Fix #22618: Deleting an object doesnt remove its self from pinned buttons Clear pin flag and pin ID in unlink_object if pinid points to unlinking object --- source/blender/blenkernel/intern/object.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 10c94ed1eeb..4e90387a2c3 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -652,6 +652,14 @@ void unlink_object(Scene *scene, Object *ob) } } } + else if(sl->spacetype==SPACE_BUTS) { + SpaceButs *sbuts= (SpaceButs *)sl; + + if(sbuts->pinid==(ID *)ob) { + sbuts->flag&= ~SB_PIN_CONTEXT; + sbuts->pinid= NULL; + } + } } sa= sa->next;