Revision: 29692 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29692 Author: blendix Date: 2010-06-25 15:44:47 +0200 (Fri, 25 Jun 2010)
Log Message: ----------- Render Branch: volumes with the camera inside were rendering on all render layers even if the object was on a different layer. Modified Paths: -------------- branches/render25/source/blender/render/intern/source/volumetric.c Modified: branches/render25/source/blender/render/intern/source/volumetric.c =================================================================== --- branches/render25/source/blender/render/intern/source/volumetric.c 2010-06-25 13:03:57 UTC (rev 29691) +++ branches/render25/source/blender/render/intern/source/volumetric.c 2010-06-25 13:44:47 UTC (rev 29692) @@ -777,13 +777,17 @@ ObjectInstanceRen *obi_backup; float prev_alpha = shr->alpha; - //if (BLI_countlist(re.render_volumes_inside) == 0) return; + /* XXX: extend to multiple volumes perhaps later */ + for(m=re->db.render_volumes_inside.first; m; m=m->next) + if(m->obi->lay & shi->shading.lay) + break; - /* XXX: extend to multiple volumes perhaps later */ + if(!m) + return; + mat_backup = shi->material.mat; obi_backup = shi->primitive.obi; - - m = re->db.render_volumes_inside.first; + shi->material.mat = m->ma; shi->primitive.obi = m->obi; shi->primitive.obr = m->obi->obr; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs