[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50740] trunk/blender/source/blender: fix for missing NULL check in init_render_texture() (possibly own fault), also remove some redundant code.

[Campbell Barton]

Revision: 50740
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50740
Author:   campbellbarton
Date:     2012-09-19 08:09:22 +0000 (Wed, 19 Sep 2012)
Log Message:
-----------
fix for missing NULL check in init_render_texture() (possibly own fault), also remove some redundant code.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
    trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
    trunk/blender/source/blender/render/intern/source/render_texture.c

Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-09-19 08:07:23 UTC (rev 50739)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c	2012-09-19 08:09:22 UTC (rev 50740)
@@ -152,7 +152,7 @@
 
 	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 */
 		}
 

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-09-19 08:07:23 UTC (rev 50739)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c	2012-09-19 08:09:22 UTC (rev 50740)
@@ -380,7 +380,7 @@
 	}
 
 	sub_v3_v3v3(far_vec, far, cent);
-	far_dist = len_v3(far_vec); /* real dist */
+	// far_dist = len_v3(far_vec); /* real dist */ /* UNUSED */
 
 	/* --- */
 

Modified: trunk/blender/source/blender/render/intern/source/render_texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_texture.c	2012-09-19 08:07:23 UTC (rev 50739)
+++ trunk/blender/source/blender/render/intern/source/render_texture.c	2012-09-19 08:09:22 UTC (rev 50740)
@@ -98,7 +98,7 @@
 {
 	/* 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 @@
 				/* 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)) {