When using Duplicated Objects (like vertex dupli) the original isn't
authorTon Roosendaal <ton@blender.org>
Sun, 29 Jan 2006 23:45:11 +0000 (23:45 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 29 Jan 2006 23:45:11 +0000 (23:45 +0000)
rendered anymore, to prevent overlapping situations. This worked before.

Note; group dupli stuff will test later. :)

source/blender/render/intern/source/convertblender.c

index 76f4b11fe7bf3797020f0b6490aa7c48b7d81f83..9fbc071f0aa610c38ff910232611a458454d4521 100644 (file)
@@ -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! */