Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2006-11-14 21:50:23 +0300
committerTon Roosendaal <ton@blender.org>2006-11-14 21:50:23 +0300
commita8ca44ea4145a347fd518a261555de537e4296a3 (patch)
tree389d4bbfc11278766dce3a3ae0172a5d9197424f /source/blender/blenkernel
parentba04e4bceb6e54bc55e1c9257ce3c5c4c2ce58f0 (diff)
Bugfix in group-proxy, Deleting objects didn't reset proxy pointers.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/object.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index f2815d428f8..862f2f8e626 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -269,9 +269,10 @@ void unlink_object(Object *ob)
/* check all objects: parents en bevels and fields, also from libraries */
obt= G.main->object.first;
while(obt) {
- if(obt->id.lib)
- if(obt->proxy==ob)
- obt->proxy= NULL;
+ if(obt->proxy==ob)
+ obt->proxy= NULL;
+ if(obt->proxy_group==ob)
+ obt->proxy_group= NULL;
if(obt->parent==ob) {
obt->parent= NULL;