diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-02-13 13:16:07 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-02-13 13:16:23 +0300 |
| commit | 4e641517874c63dc483c4a0153e5c3890deb48d1 (patch) | |
| tree | 0e724bca616793750af739b26b6df5359ce6e107 /source/blender/editors/space_view3d/view3d_view.c | |
| parent | 8a92277a317459a591a7898c5d7927584d1c9718 (diff) | |
Outliner: allow for renaming of collection and small touch ups in the
code
Note: Master Collection should not be renamable, but also, it should be marked as MasterCollection (with an icon probably)
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_view.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 53c91936913..2da1871009e 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1112,7 +1112,7 @@ static void view3d_select_loop(ViewContext *vc, Scene *scene, SceneLayer *sl, Vi v3d->xray = true; /* otherwise it postpones drawing */ for (base = sl->object_bases.first; base; base = base->next) { if ((base->flag & BASE_VISIBLED) != 0) { - if ((base->object->restrictflag & OB_RESTRICT_SELECT) || + if (((base->flag & BASE_SELECTABLED) == 0) || (use_obedit_skip && (scene->obedit->data == base->object->data))) { base->selcol = 0; |