← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/displist.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/blenkernel/intern/displist.c
1
1
/*  displist.c
2
2
 * 
3
3
 * 
4
 
 * $Id: displist.c,v 1.153 2007/02/14 14:42:48 ton Exp $
 
4
 * $Id: displist.c,v 1.156 2007/05/02 01:40:27 campbellbarton Exp $
5
5
 *
6
6
 * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
7
7
 *
240
240
                                a= dl->parts*dl->nr;
241
241
                                v1= ndata;
242
242
                                while(a--) {
243
 
                                        Normalise(v1);
 
243
                                        Normalize(v1);
244
244
                                        v1+= 3;
245
245
                                }
246
246
                        }
279
279
/* ***************************** shade displist. note colors now are in rgb(a) order ******************** */
280
280
 
281
281
/* create default shade input... save cpu cycles with ugly global */
 
282
/* XXXX bad code warning: local ShadeInput initialize... */
282
283
static ShadeInput shi;
283
284
static void init_fastshade_shadeinput(void)
284
285
{
286
287
        shi.lay= G.scene->lay;
287
288
        shi.view[2]= -1.0f;
288
289
        shi.passflag= SCE_PASS_COMBINED;
 
290
        shi.combinedflag= -1;
289
291
}
290
292
 
291
293
static Render *fastshade_get_render(void)
332
334
                layer= &fdata->layers[index];
333
335
                
334
336
                if(needuv && layer->type == CD_MTFACE && shi.totuv < MAX_MTFACE) {
335
 
                        n= fastshade_customdata_layer_num(shi.totuv, layer->active);
 
337
                        n= fastshade_customdata_layer_num(shi.totuv, layer->active_rnd);
336
338
                        mtface= &((MTFace*)layer->data)[a];
337
339
 
338
340
                        shi.uv[shi.totuv].uv[0]= 2.0f*mtface->uv[j][0]-1.0f;
343
345
                        shi.totuv++;
344
346
                }
345
347
                else if(layer->type == CD_MCOL && shi.totcol < MAX_MCOL) {
346
 
                        n= fastshade_customdata_layer_num(shi.totcol, layer->active);
 
348
                        n= fastshade_customdata_layer_num(shi.totcol, layer->active_rnd);
347
349
                        vertcol= (char*)&((MCol*)layer->data)[a*4 + j];
348
350
 
349
351
                        shi.col[shi.totcol].col[0]= ((float)vertcol[3])/255.0f;
525
527
                vn[0]= imat[0][0]*xn+imat[0][1]*yn+imat[0][2]*zn;
526
528
                vn[1]= imat[1][0]*xn+imat[1][1]*yn+imat[1][2]*zn;
527
529
                vn[2]= imat[2][0]*xn+imat[2][1]*yn+imat[2][2]*zn;
528
 
                Normalise(vn);
 
530
                Normalize(vn);
529
531
        }               
530
532
 
531
533
        for (i=0; i<totface; i++) {
555
557
                n1[0]= imat[0][0]*nor[0]+imat[0][1]*nor[1]+imat[0][2]*nor[2];
556
558
                n1[1]= imat[1][0]*nor[0]+imat[1][1]*nor[1]+imat[1][2]*nor[2];
557
559
                n1[2]= imat[2][0]*nor[0]+imat[2][1]*nor[1]+imat[2][2]*nor[2];
558
 
                Normalise(n1);
 
560
                Normalize(n1);
559
561
 
560
562
                for (j=0; j<nverts; j++) {
561
563
                        MVert *mv= &mvert[vidx[j]];
666
668
                                                n1[0]= imat[0][0]*dl->nors[0]+imat[0][1]*dl->nors[1]+imat[0][2]*dl->nors[2];
667
669
                                                n1[1]= imat[1][0]*dl->nors[0]+imat[1][1]*dl->nors[1]+imat[1][2]*dl->nors[2];
668
670
                                                n1[2]= imat[2][0]*dl->nors[0]+imat[2][1]*dl->nors[1]+imat[2][2]*dl->nors[2];
669
 
                                                Normalise(n1);
 
671
                                                Normalize(n1);
670
672
                                                
671
673
                                                fp= dl->verts;
672
674
                                                
694
696
                                                        n1[0]= imat[0][0]*nor[0]+imat[0][1]*nor[1]+imat[0][2]*nor[2];
695
697
                                                        n1[1]= imat[1][0]*nor[0]+imat[1][1]*nor[1]+imat[1][2]*nor[2];
696
698
                                                        n1[2]= imat[2][0]*nor[0]+imat[2][1]*nor[1]+imat[2][2]*nor[2];
697
 
                                                        Normalise(n1);
 
699
                                                        Normalize(n1);
698
700
                                
699
701
                                                        fastshade(vec, n1, fp, ma, (char *)col1, NULL);
700
702
                                                        
732
734
                                                        n1[0]= imat[0][0]*nor[0]+imat[0][1]*nor[1]+imat[0][2]*nor[2];
733
735
                                                        n1[1]= imat[1][0]*nor[0]+imat[1][1]*nor[1]+imat[1][2]*nor[2];
734
736
                                                        n1[2]= imat[2][0]*nor[0]+imat[2][1]*nor[1]+imat[2][2]*nor[2];
735
 
                                                        Normalise(n1);
 
737
                                                        Normalize(n1);
736
738
                                                
737
739
                                                        fastshade(vec, n1, fp, ma, (char *)col1, NULL);
738
740