diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-02-29 02:14:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-29 02:14:55 +0300 |
commit | 5665d9333e8f1e047f838a4f64a2b3398fd76b28 (patch) | |
tree | 07b9470e346de53d7c3ebbe421fb76c6cf3e8d21 /source/blender/src/outliner.c | |
parent | 6169b29b3a53eca3e342aeee9d33809e61f026c3 (diff) |
* Fix for own big, Adding group objects from the outliner didnt check they were externally linked.
* ping "~" in the fileselectors dir will take you to $HOME (non win32)
* Added a file selector for Node output image
Diffstat (limited to 'source/blender/src/outliner.c')
-rw-r--r-- | source/blender/src/outliner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/outliner.c b/source/blender/src/outliner.c index 7f4736d9dd4..b9c1725233f 100644 --- a/source/blender/src/outliner.c +++ b/source/blender/src/outliner.c @@ -2683,7 +2683,6 @@ static void group_linkobs2scene_cb(TreeElement *te, TreeStoreElem *tsep, TreeSto base->object->flag |= SELECT; base->flag |= SELECT; } else { - /* link to scene */ base= MEM_callocN( sizeof(Base), "add_base"); BLI_addhead(&G.scene->base, base); @@ -2691,6 +2690,7 @@ static void group_linkobs2scene_cb(TreeElement *te, TreeStoreElem *tsep, TreeSto gob->ob->flag |= SELECT; base->flag = gob->ob->flag; base->object= gob->ob; + id_lib_extern((ID *)gob->ob); /* incase these are from a linked group */ } } } |