diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-19 12:09:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-19 12:09:22 +0400 |
| commit | f5d3e361cec686fe90faba9c8bc1681b595243b3 (patch) | |
| tree | 719f77f9e2f7596570a3a4ed4527c0afe97789cd | |
| parent | 123a25c52be2386c202fe81a8df042b1cc8cb81f (diff) | |
fix for missing NULL check in init_render_texture() (possibly own fault), also remove some redundant code.
| -rw-r--r-- | source/blender/blenkernel/intern/editderivedmesh.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_construct.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_texture.c | 10 |
3 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index befec1907da..8d430eb58b5 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -152,7 +152,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm) BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { /* don't consider two-edged faces */ - if (efa->len < 3) { + if (UNLIKELY(efa->len < 3)) { /* do nothing */ } diff --git a/source/blender/bmesh/intern/bmesh_construct.c b/source/blender/bmesh/intern/bmesh_construct.c index 4740140187d..72d9c9ab342 100644 --- a/source/blender/bmesh/intern/bmesh_construct.c +++ b/source/blender/bmesh/intern/bmesh_construct.c @@ -380,7 +380,7 @@ BMFace *BM_face_create_ngon_vcloud(BMesh *bm, BMVert **vert_arr, int totv, int n } sub_v3_v3v3(far_vec, far, cent); - far_dist = len_v3(far_vec); /* real dist */ + // far_dist = len_v3(far_vec); /* real dist */ /* UNUSED */ /* --- */ diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index 6d22d8991b4..cbf2a37eeb7 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -98,7 +98,7 @@ static void init_render_texture(Render *re, Tex *tex) { /* imap test */ if (tex->ima && ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) { - BKE_image_user_frame_calc(&tex->iuser, re->r.cfra, re?re->flag & R_SEC_FIELD:0); + BKE_image_user_frame_calc(&tex->iuser, re ? re->r.cfra : 0, re ? re->flag & R_SEC_FIELD:0); } else if (tex->type==TEX_ENVMAP) { @@ -2760,11 +2760,9 @@ void do_volume_tex(ShadeInput *shi, const float *xyz, int mapto_flag, float col_ /* stencil maps on the texture control slider, not texture intensity value */ /* convert RGB to intensity if intensity info isn't provided */ - if (!(rgbnor & TEX_INT)) { - if (rgbnor & TEX_RGB) { - if (texres.talpha) texres.tin = texres.ta; - else texres.tin = rgb_to_grayscale(&texres.tr); - } + if (rgbnor & TEX_RGB) { + if (texres.talpha) texres.tin = texres.ta; + else texres.tin = rgb_to_grayscale(&texres.tr); } if ((mapto_flag & MAP_EMISSION) && (mtex->mapto & MAP_EMISSION)) { |