← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

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

  • Committer: Reinhard Tartler
  • Date: 2014-05-31 01:50:05 UTC
  • mfrom: (14.2.27 sid)
  • Revision ID: siretart@tauware.de-20140531015005-ml6druahuj82nsav
merge from debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/intern/source/pixelshading.c
73
73
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
74
74
 
75
75
 
76
 
extern float hashvectf[];
 
76
extern const float hashvectf[];
77
77
 
78
78
static void render_lighting_halo(HaloRen *har, float col_r[3])
79
79
{
289
289
 
290
290
        if (R.wrld.mode & WO_MIST) {
291
291
                if (har->type & HA_ONLYSKY) {
292
 
                        /* stars but no mist */
293
292
                        alpha= har->alfa;
294
293
                }
295
294
                else {
341
340
        if (flarec) har->pixels+= (int)(har->rad-radist);
342
341
 
343
342
        if (har->ringc) {
344
 
                float *rc, fac;
 
343
                const float *rc;
 
344
                float fac;
345
345
                int ofs;
346
346
                
347
347
                /* per ring an antialised circle */
393
393
                dist= 0.0f;
394
394
        
395
395
        if (har->linec) {
396
 
                float *rc, fac;
 
396
                const float *rc;
 
397
                float fac;
397
398
                int ofs;
398
399
                
399
400
                /* per starpoint an antialiased line */
516
517
                
517
518
                if (blend<0.0f) skyflag= 0;
518
519
                
519
 
                blend= fabs(blend);
 
520
                blend = fabsf(blend);
520
521
        }
521
522
        else if (R.wrld.skytype & WO_SKYPAPER) {
522
523
                blend= 0.5f + 0.5f * view[1];
523
524
        }
524
525
        else {
525
526
                /* the fraction of how far we are above the bottom of the screen */
526
 
                blend= fabs(0.5f + view[1]);
 
527
                blend = fabsf(0.5f + view[1]);
527
528
        }
528
529
 
529
530
        copy_v3_v3(hor, &R.wrld.horr);