~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/**
2
 
 * $Id: initrender.c 14863 2008-05-16 10:20:30Z theeth $
 
2
 * $Id: initrender.c 16827 2008-09-29 17:08:11Z campbellbarton $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
257
257
{
258
258
        static int firsttime= 1;
259
259
        SampleTables *st;
260
 
        float flweight[32], fmask[256];
 
260
        float flweight[32];
261
261
        float weight[32], totw, val, *fpx1, *fpx2, *fpy1, *fpy2, *m3, *m4;
262
262
        int i, j, a;
263
263
 
300
300
                st->centLut[a]= -0.45+((float)a)/16.0;
301
301
        }
302
302
 
303
 
        val= 1.0/((float)re->osa);
304
 
        for(a=0; a<256; a++) {
305
 
                fmask[a]= ((float)st->cmask[a])*val;
306
 
        }
307
 
 
308
303
        /* calculate totw */
309
304
        totw= 0.0;
310
305
        for(j= -1; j<2; j++) {