Can you be more specific in your commits? what does this fix? cheers
Daniel Salazar www.3developer.com On Fri, May 28, 2010 at 8:45 AM, Joseph Eagar <[email protected]> wrote: > Revision: 29046 > > http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29046 > Author: joeedh > Date: 2010-05-28 16:45:16 +0200 (Fri, 28 May 2010) > > Log Message: > ----------- > fixed object id bug > > Modified Paths: > -------------- > branches/render25/source/blender/blenkernel/intern/collision.c > branches/render25/source/blender/render/intern/source/convertblender.c > > Modified: branches/render25/source/blender/blenkernel/intern/collision.c > =================================================================== > --- branches/render25/source/blender/blenkernel/intern/collision.c > 2010-05-28 10:37:15 UTC (rev 29045) > +++ branches/render25/source/blender/blenkernel/intern/collision.c > 2010-05-28 14:45:16 UTC (rev 29046) > @@ -895,7 +895,6 @@ > > *w1 = (e * c - b * f) / (a * c - b * b); > *w2 = (f - b * *w1) / c; > - > } > > // calculates the distance of 2 edges > > Modified: > branches/render25/source/blender/render/intern/source/convertblender.c > =================================================================== > --- branches/render25/source/blender/render/intern/source/convertblender.c > 2010-05-28 10:37:15 UTC (rev 29045) > +++ branches/render25/source/blender/render/intern/source/convertblender.c > 2010-05-28 14:45:16 UTC (rev 29046) > @@ -392,7 +392,7 @@ > int show_emitter, allow_render= 1, index, psysindex, i; > > if (dob) > - index = par->index ? par->index : dob->index; > + index = par->index ? par->index : dob->ob->index; > else index = ob->index; > > /* the emitter has to be processed first (render levels of > modifiers) */ > @@ -775,7 +775,7 @@ > * a dupligroup that has > already been created before */ > if(dob->type != > OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, obd, 0))) { > mul_m4_m4m4(mat, > dob->mat, re->cam.viewmat); > - obi= > render_instance_create(&re->db, NULL, obd, ob, dob->index, 0, mat, > obd->lay); > + obi= > render_instance_create(&re->db, NULL, obd, ob, dob->ob->index, 0, mat, > obd->lay); > > /* fill in instance > variables for texturing */ > > set_dupli_tex_mat(re, obi, dob); > @@ -803,7 +803,7 @@ > psysindex= 1; > > for(psys=obd->particlesystem.first; psys; psys=psys->next) { > if(dob->type != > OB_DUPLIGROUP || (obr=find_dupligroup_dupli(re, ob, psysindex))) { > - obi= > render_instance_create(&re->db, NULL, obd, ob, dob->index, psysindex++, mat, > obd->lay); > + obi= > render_instance_create(&re->db, NULL, obd, ob, dob->ob->index, psysindex++, > mat, obd->lay); > > > set_dupli_tex_mat(re, obi, dob); > if(dob->type > != OB_DUPLIGROUP) { > > > _______________________________________________ > Bf-blender-cvs mailing list > [email protected] > http://lists.blender.org/mailman/listinfo/bf-blender-cvs > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
