diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-05-30 16:19:20 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-05-30 16:19:20 +0400 |
| commit | 139106ca8530f2c8356ba2b1e3e51a968af30ff9 (patch) | |
| tree | 6eda395d0d415e61c4fc0d681cc4ddd3a9d46528 | |
| parent | bb78faef2701120809e7fca9000e7dd8af5c09c1 (diff) | |
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.
| -rw-r--r-- | source/blender/src/outliner.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) { |