diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-16 18:11:58 +0400 |
| commit | 23807d1fb43de44ca7c4db5dc7bd92178f4b6a14 (patch) | |
| tree | 6d2e17c8405789363e69df000cf14207110428b2 /source/blender/editors/space_outliner/outliner_select.c | |
| parent | 02d2472baacd8ac091a29392a2bc9ac8693fb5e7 (diff) | |
| parent | dddfb5e1738830c325e796a474d0ea14d64654f3 (diff) | |
Merging trunk up to r39447.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 23873b1fde7..b701aecafb8 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -658,8 +658,8 @@ int tree_element_active(bContext *C, Scene *scene, SpaceOops *soops, TreeElement { switch(te->idcode) { - case ID_OB: - return tree_element_set_active_object(C, scene, soops, te, set); + /* Note: no ID_OB: objects are handled specially to allow multiple + selection. See do_outliner_item_activate. */ case ID_MA: return tree_element_active_material(C, scene, soops, te, set); case ID_WO: |