diff options
| -rw-r--r-- | source/blender/src/drawobject.c | 2 | ||||
| -rw-r--r-- | source/blender/src/editview.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index e01d96964d6..0deb7c308c3 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3650,7 +3650,7 @@ void draw_object(Base *base, int flag) ob= base->object; - if (!(G.obedit)) { + if (ob!=G.obedit) { /* * Always draw dupli objects here, restriction of those is governed by the flag of their duplicator * object, in drawview.c, draw_dupli_objects() diff --git a/source/blender/src/editview.c b/source/blender/src/editview.c index 2aedee5e43d..de7fd8f5cf4 100644 --- a/source/blender/src/editview.c +++ b/source/blender/src/editview.c @@ -1354,6 +1354,14 @@ void mouse_select(void) base= startbase; while(base) { + /* skip objects with select restriction, to prevent prematurely ending this loop + * with an un-selectable choice */ + if (base->object->restrictflag & OB_RESTRICT_SELECT) { + base=base->next; + if(base==NULL) base= FIRSTBASE; + if(base==startbase) break; + } + if(base->lay & G.vd->lay) { for(a=0; a<hits; a++) { if(has_bones) { |