← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/intern/source/rendercore.c
1957
1957
        RenderResult *rr= re->result;
1958
1958
        RenderLayer *rl;
1959
1959
        HaloRen *har;
1960
 
        int a, mode, do_draw = FALSE;
 
1960
        int a, mode;
1961
1961
        
1962
1962
        /* for now, we get the first renderlayer in list with halos set */
1963
 
        for (rl= rr->layers.first; rl; rl= rl->next)
1964
 
                if (rl->layflag & SCE_LAY_HALO)
1965
 
                        break;
1966
 
 
1967
 
        if (rl==NULL || rl->rectf==NULL)
1968
 
                return;
1969
 
        
1970
 
        mode= R.r.mode;
1971
 
        R.r.mode &= ~R_PANORAMA;
1972
 
        
1973
 
        project_renderdata(&R, projectverto, 0, 0, 0);
1974
 
        
1975
 
        for (a=0; a<R.tothalo; a++) {
1976
 
                har= R.sortedhalos[a];
1977
 
                
1978
 
                if (har->flarec) {
1979
 
                        do_draw = TRUE;
1980
 
                        renderflare(rr, rl->rectf, har);
1981
 
                }
1982
 
        }
1983
 
 
1984
 
        if (do_draw) {
1985
 
                /* weak... the display callback wants an active renderlayer pointer... */
1986
 
                rr->renlay= rl;
1987
 
                re->display_draw(re->ddh, rr, NULL);
1988
 
        }
1989
 
        
1990
 
        R.r.mode= mode;
 
1963
        for (rl= rr->layers.first; rl; rl= rl->next) {
 
1964
                int do_draw = FALSE;
 
1965
                
 
1966
                if ((rl->layflag & SCE_LAY_HALO) == 0)
 
1967
                        continue;
 
1968
                if (rl->rectf==NULL)
 
1969
                        continue;
 
1970
                
 
1971
                mode= R.r.mode;
 
1972
                R.r.mode &= ~R_PANORAMA;
 
1973
                
 
1974
                project_renderdata(&R, projectverto, 0, 0, 0);
 
1975
                
 
1976
                for (a=0; a<R.tothalo; a++) {
 
1977
                        har= R.sortedhalos[a];
 
1978
                        
 
1979
                        if (har->flarec && (har->lay & rl->lay)) {
 
1980
                                do_draw = TRUE;
 
1981
                                renderflare(rr, rl->rectf, har);
 
1982
                        }
 
1983
                }
 
1984
                
 
1985
                if (do_draw) {
 
1986
                        /* weak... the display callback wants an active renderlayer pointer... */
 
1987
                        rr->renlay= rl;
 
1988
                        re->display_draw(re->ddh, rr, NULL);
 
1989
                }
 
1990
 
 
1991
                R.r.mode= mode;
 
1992
        }
1991
1993
}
1992
1994