Fix for bug #8463: object texture mapping for duplis was changed to

act as if the object was in its original position, instead of being
different for all instances. However, this is desired behavior in
some cases and so breaks compatibility. Now it only does the new
behavior when enabling the "From Original" option.
This commit is contained in:
2008-04-12 18:44:03 +00:00
parent ea4a315f3d
commit f8d1bc8ee7
3 changed files with 7 additions and 2 deletions

View File

@@ -1468,8 +1468,9 @@ void do_material_tex(ShadeInput *shi)
dx= dxt;
dy= dyt;
VECCOPY(tempvec, shi->co);
if(shi->obi && shi->obi->duplitexmat)
MTC_Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
if(mtex->texflag & MTEX_OB_DUPLI_ORIG)
if(shi->obi && shi->obi->duplitexmat)
MTC_Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
MTC_Mat4MulVecfl(ob->imat, tempvec);
if(shi->osatex) {
VECCOPY(dxt, shi->dxco);