← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/radiosity/intern/source/radpreprocess.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/radiosity/intern/source/radpreprocess.c
34
34
        - countglobaldata()
35
35
        - makeGlobalElemArray()
36
36
        
37
 
   $Id: radpreprocess.c 14444 2008-04-16 22:40:48Z hos $
 
37
   $Id: radpreprocess.c 16827 2008-09-29 17:08:11Z campbellbarton $
38
38
 
39
39
  *************************************** */
40
40
 
68
68
 
69
69
#include "radio.h"
70
70
 
 
71
#include "BLO_sys_types.h" // for intptr_t support
 
72
 
71
73
#ifdef HAVE_CONFIG_H
72
74
#include <config.h>
73
75
#endif
179
181
 
180
182
void addedge(float *v1, float *v2, EdSort *es)
181
183
{
182
 
        if( ((long)v1)<((long)v2) ) {
 
184
        if( ((intptr_t)v1)<((intptr_t)v2) ) {
183
185
                es->v1= v1;
184
186
                es->v2= v2;
185
187
        }
287
289
        MEM_freeN(esblock);
288
290
}
289
291
 
290
 
int materialIndex(Material *ma)
 
292
static int materialIndex(Material *ma)
291
293
{
292
294
        int i = 0;
293
295
        for(i=0;i< RG.totmat; i++)