diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-01-04 20:48:07 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-01-04 20:48:07 +0300 |
| commit | 2f7dad7df78ecc7a3a00f784a749a8dbd223061d (patch) | |
| tree | 6a4061068aefd29be78018cb82642fba7ea9d943 /source/blender/src/drawview.c | |
| parent | 9ac2817fef9f77be3ccb50441e3cd87379680c61 (diff) | |
- Make dupliverts inside a dupligroup render and draw as instances.
- Possible fix for a dupli render memory leak, but i'm not sure.
Diffstat (limited to 'source/blender/src/drawview.c')
| -rw-r--r-- | source/blender/src/drawview.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c index 8fb5ba6cf2a..663227233a4 100644 --- a/source/blender/src/drawview.c +++ b/source/blender/src/drawview.c @@ -2657,10 +2657,6 @@ static void draw_dupli_objects_color(View3D *v3d, Base *base, int color) if (base->object->restrictflag & OB_RESTRICT_VIEW) return; - /* test if we can do a displist */ - if(base->object->transflag & OB_DUPLIGROUP) - use_displist= 0; - tbase.flag= OB_FROMDUPLI|base->flag; lb= object_duplilist(G.scene, base->object); @@ -2689,7 +2685,7 @@ static void draw_dupli_objects_color(View3D *v3d, Base *base, int color) if(use_displist == -1) { /* lamp drawing messes with matrices, could be handled smarter... but this works */ - if(dob->ob->type==OB_LAMP) + if(dob->ob->type==OB_LAMP || dob->type==OB_DUPLIGROUP) use_displist= 0; else { /* disable boundbox check for list creation */ |