[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58210] trunk/blender/source/blender/ blenkernel/intern: remove redundant null checks and avoid divide by zero in driver evaluation

[Campbell Barton]

Revision: 58210
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58210
Author:   campbellbarton
Date:     2013-07-13 05:53:14 +0000 (Sat, 13 Jul 2013)
Log Message:
-----------
remove redundant null checks and avoid divide by zero in driver evaluation

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/fcurve.c
    trunk/blender/source/blender/blenkernel/intern/lattice.c
    trunk/blender/source/blender/blenkernel/intern/material.c

Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c	2013-07-13 05:50:35 UTC (rev 58209)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c	2013-07-13 05:53:14 UTC (rev 58210)
@@ -1697,7 +1697,7 @@
 				
 				/* perform operations on the total if appropriate */
 				if (driver->type == DRIVER_TYPE_AVERAGE)
-					driver->curval = (value / (float)tot);
+					driver->curval = tot ? (value / (float)tot) : 0.0f;
 				else
 					driver->curval = value;
 			}

Modified: trunk/blender/source/blender/blenkernel/intern/lattice.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/lattice.c	2013-07-13 05:50:35 UTC (rev 58209)
+++ trunk/blender/source/blender/blenkernel/intern/lattice.c	2013-07-13 05:53:14 UTC (rev 58210)
@@ -681,7 +681,7 @@
 	 * we want either a Mesh with no derived data, or derived data with
 	 * deformverts
 	 */
-	if (target && target->type == OB_MESH) {
+	if (target->type == OB_MESH) {
 		/* if there's derived data without deformverts, don't use vgroups */
 		if (dm) {
 			use_vgroups = (dm->getVertData(dm, 0, CD_MDEFORMVERT) != NULL);

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2013-07-13 05:50:35 UTC (rev 58209)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2013-07-13 05:53:14 UTC (rev 58210)
@@ -2051,8 +2051,10 @@
 				printf("Warning: material \"%s\" skipped - to convert old game texface to material go to the Help menu.\n", ma->id.name + 2);
 				nowarning = 0;
 			}
-			else
-				convert_tfacematerial(main, ma); continue;
+			else {
+				convert_tfacematerial(main, ma);
+			}
+			continue;
 		}
 	
 		/* no conflicts in this material - 90% of cases