← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/render/intern/source/render_texture.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/render_texture.c
2163
2163
                        mtex= shi->mat->mtex[tex_nr];
2164
2164
                        
2165
2165
                        tex= mtex->tex;
2166
 
                        if (tex==0) continue;
 
2166
                        if (tex == NULL) continue;
2167
2167
 
2168
2168
                        found_deriv_map = (tex->type==TEX_IMAGE) && (tex->imaflag & TEX_DERIVATIVEMAP);
2169
2169
                        use_compat_bump= (mtex->texflag & MTEX_COMPAT_BUMP);
2686
2686
                if (shi->mat->mtex[tex_nr]) {
2687
2687
                        mtex= shi->mat->mtex[tex_nr];
2688
2688
                        tex= mtex->tex;
2689
 
                        if (tex==0) continue;
 
2689
                        if (tex == NULL) continue;
2690
2690
                        
2691
2691
                        /* only process if this texture is mapped 
2692
2692
                         * to one that we're interested in */
3028
3028
                        mtex= R.wrld.mtex[tex_nr];
3029
3029
                        
3030
3030
                        tex= mtex->tex;
3031
 
                        if (tex==0) continue;
 
3031
                        if (tex == NULL) continue;
3032
3032
                        /* if (mtex->mapto==0) continue; */
3033
3033
                        
3034
3034
                        /* which coords */
3609
3609
                        }
3610
3610
                        if (tex->type==TEX_POINTDENSITY) {
3611
3611
                                /* set dummy values for render and do cache */
3612
 
                                Render dummy_re = {0};
 
3612
                                Render dummy_re = {NULL};
3613
3613
                                dummy_re.scene = scene;
3614
3614
                                unit_m4(dummy_re.viewinv);
3615
3615
                                unit_m4(dummy_re.viewmat);
3668
3668
        int v1, v2, v3;
3669
3669
        MVert *mvert;
3670
3670
        float uv[3], normal[3];
3671
 
        ShadeInput shi = {0};
3672
 
        Render re = {0};
 
3671
        ShadeInput shi = {NULL};
 
3672
        Render re = {NULL};
3673
3673
 
3674
3674
        /* Get face data        */
3675
3675
        mvert = orcoDm->getVertArray(orcoDm);
3752
3752
                *alpha = shi.alpha;
3753
3753
        }
3754
3754
        else if (mat->material_type == MA_TYPE_VOLUME) {
3755
 
                ObjectInstanceRen obi = {0};
 
3755
                ObjectInstanceRen obi = {NULL};
3756
3756
                obi.ob = ob;
3757
3757
                shi.obi = &obi;
3758
3758
                unit_m4(re.viewinv);