diff options
| author | Matt Ebb <matt@mke3.net> | 2006-11-21 06:22:34 +0300 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2006-11-21 06:22:34 +0300 |
| commit | 476af8c06a999c8848680ff19bb07d93602e1074 (patch) | |
| tree | 6bfa45532269553457f22d36b6ac4bc3c926edea /source/blender/src/drawobject.c | |
| parent | 0d56a6e3197ddfc888c10c0c3615106dd65e560f (diff) | |
* Dupli objects (dupliverts, dupligroup, etc) now get invisibility based on their
parent object, not the original instantiated objects. i.e, if an object is invisible,
its child dupli objects will be too.
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 22d167b1ce0..e01d96964d6 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3650,7 +3650,14 @@ void draw_object(Base *base, int flag) ob= base->object; - if (!(G.obedit) && (ob->restrictflag & OB_RESTRICT_VIEW)) return; + if (!(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() + */ + if ((ob->restrictflag & OB_RESTRICT_VIEW) && !(base->flag & OB_FROMDUPLI)) + return; + } /* xray delay? */ if((flag & DRAW_PICKING)==0 && (base->flag & OB_FROMDUPLI)==0) { |