diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-30 02:45:11 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-30 02:45:11 +0300 |
| commit | b01b5746561b626951997ba3ae36de1073761c60 (patch) | |
| tree | b63e19dcba86ee1ac0aa7f0e934ffdb48ce574e3 /source/blender/render | |
| parent | 38cafa3009d64fca019864b7c8ac4b17f6b7d54e (diff) | |
When using Duplicated Objects (like vertex dupli) the original isn't
rendered anymore, to prevent overlapping situations. This worked before.
Note; group dupli stuff will test later. :)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 76f4b11fe7b..9fbc071f0aa 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -2788,7 +2788,9 @@ void RE_Database_FromScene(Render *re, Scene *scene, int use_camera_view) for(SETLOOPER(re->scene, base)) { ob= base->object; - if( (base->lay & lay) || (ob->type==OB_LAMP && (base->lay & re->scene->lay)) ) { + /* OB_DONE means the object itself got duplicated, so was already converted */ + if(ob->flag & OB_DONE); + else if( (base->lay & lay) || (ob->type==OB_LAMP && (base->lay & re->scene->lay)) ) { if(ob->transflag & OB_DUPLI) { /* exception: mballs! */ |