← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/exotic.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
https://launchpad.net/bugs/320045
[ 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:
source/blender/blenkernel/intern/exotic.c
2097
2097
                        }
2098
2098
 
2099
2099
                        for(a=0; a<dl->parts; a++) {
2100
 
 
2101
 
                                DL_SURFINDEX(dl->flag & DL_CYCL_U, dl->flag & DL_CYCL_V, dl->nr, dl->parts);
 
2100
                                
 
2101
                                if (surfindex_displist(dl, a, &b, &p1, &p2, &p3, &p4)==0)
 
2102
                                        break;
 
2103
                                
2102
2104
                                p1+= startve; 
2103
2105
                                p2+= startve; 
2104
2106
                                p3+= startve; 
2632
2634
 
2633
2635
                        if(evl->v4==0) {
2634
2636
                                fprintf(fp, "3 %ld %ld %ld 0x%x\n", 
2635
 
                                                evl->v1->tmp.l,
2636
 
                                                evl->v2->tmp.l,
2637
 
                                                evl->v3->tmp.l, 
 
2637
                                                (long int) evl->v1->tmp.l,
 
2638
                                                (long int) evl->v2->tmp.l,
 
2639
                                                (long int) evl->v3->tmp.l, 
2638
2640
                                                kleur[evl->mat_nr]);
2639
2641
                        }
2640
2642
                        else {
2641
2643
                                fprintf(fp, "4 %ld %ld %ld %ld 0x%x\n", 
2642
 
                                                evl->v1->tmp.l, 
2643
 
                                                evl->v2->tmp.l, 
2644
 
                                                evl->v3->tmp.l, 
2645
 
                                                evl->v4->tmp.l, 
 
2644
                                                (long int) evl->v1->tmp.l, 
 
2645
                                                (long int) evl->v2->tmp.l, 
 
2646
                                                (long int) evl->v3->tmp.l, 
 
2647
                                                (long int) evl->v4->tmp.l, 
2646
2648
                                                kleur[evl->mat_nr]);
2647
2649
                        }
2648
2650
                        evl= evl->next;