← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/blender/gutsy-security

« back to all changes in this revision

Viewing changes to source/blender/render/intern/source/texture.c

  • Committer: Bazaar Package Importer
  • Author(s): Florian Ernst
  • Date: 2007-05-17 11:47:59 UTC
  • mfrom: (1.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20070517114759-yp4ybrnhp2u7pk66
Tags: 2.44-1
* New upstream release.
* Drop debian/patches/01_64bits_stupidity, not needed anymore: as of this
  version blender is 64 bits safe again. Adjust README.Debian accordingly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/intern/source/texture.c
1
1
/*
2
 
 * $Id: texture.c,v 1.83 2007/02/09 10:35:04 ton Exp $
 
2
 * $Id: texture.c,v 1.84 2007/04/04 13:18:30 campbellbarton Exp $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
1652
1652
                                        // rotate to global coords
1653
1653
                                        if(mtex->texco==TEXCO_ORCO || mtex->texco==TEXCO_UV) {
1654
1654
                                                if(shi->vlr && shi->vlr->ob) {
1655
 
                                                        float len= Normalise(texres.nor);
 
1655
                                                        float len= Normalize(texres.nor);
1656
1656
                                                        // can be optimized... (ton)
1657
1657
                                                        Mat4Mul3Vecfl(shi->vlr->ob->obmat, texres.nor);
1658
1658
                                                        Mat4Mul3Vecfl(R.viewmat, texres.nor);
1659
 
                                                        Normalise(texres.nor);
 
1659
                                                        Normalize(texres.nor);
1660
1660
                                                        VecMulf(texres.nor, len);
1661
1661
                                                }
1662
1662
                                        }
1762
1762
                                                        shi->vn[2]+= dot*nor[2];
1763
1763
                                                }
1764
1764
                                        }                                       
1765
 
                                        Normalise(shi->vn);
 
1765
                                        Normalize(shi->vn);
1766
1766
                                        
1767
1767
                                        /* this makes sure the bump is passed on to the next texture */
1768
1768
                                        shi->orn[0]= -shi->vn[0];
2157
2157
                                else texres.tin*= stencilTin;
2158
2158
                        }
2159
2159
                        
2160
 
                        /* colour mapping */
 
2160
                        /* color mapping */
2161
2161
                        if(mtex->mapto & (WOMAP_HORIZ+WOMAP_ZENUP+WOMAP_ZENDOWN)) {
2162
2162
                                float tcol[3];
2163
2163