kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

* Dupli objects (dupliverts, dupligroup, etc) now get invisibility based on their

Browse Source 
parent object, not the original instantiated objects. i.e, if an object is invisible,
its child dupli objects will be too.
This commit is contained in:
Matt Ebb 2006-11-21 03:22:34 +00:00
parent 0d56a6e319
commit 476af8c06a
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/src/drawobject.c
View File

@ -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) {

2
source/blender/src/drawview.c
View File

@ -2647,6 +2647,8 @@ static void draw_dupli_objects(View3D *v3d, Base *base)
short transflag;
char dt, dtx;
if (base->object->restrictflag & OB_RESTRICT_VIEW) return;
/* debug */
if(base->object->dup_group && base->object->dup_group->id.us<1)
color= TH_REDALERT;