From 139106ca8530f2c8356ba2b1e3e51a968af30ff9 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Mon, 30 May 2005 12:19:20 +0000 Subject: Lukep noticed bug in outliner, when an object has a parent that only resides in another scene, the outliner inserts that child object in the parent's scene. Although it seems cosmetic, i could create crashes with it... fixed. --- source/blender/src/outliner.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 513f4687921..1baff512174 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -678,6 +678,8 @@ static void outliner_build_tree(SpaceOops *soops) ten->directdata= base; } outliner_make_hierarchy(soops, &te->subtree); + /* clear id.newid, to prevent objects be inserted in wrong scenes (parent in other scene) */ + for(base= sce->base.first; base; base= base->next) base->object->id.newid= NULL; } } else if(soops->outlinevis == SO_CUR_SCENE) { -- cgit v1.2.3