[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51143] trunk/blender/source/blender: fix for logical errors

[Campbell Barton]

Revision: 51143
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51143
Author:   campbellbarton
Date:     2012-10-07 10:01:54 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
fix for logical errors
- range check on hair_velocity_smoothing() was off by one.
- cloth sim parm's are used before NULL check in readfile.c

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/implicit.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c	2012-10-07 09:48:59 UTC (rev 51142)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c	2012-10-07 10:01:54 UTC (rev 51143)
@@ -1450,7 +1450,7 @@
 		i = HAIR_GRID_INDEX(lX[v], gmin, gmax, 0);
 		j = HAIR_GRID_INDEX(lX[v], gmin, gmax, 1);
 		k = HAIR_GRID_INDEX(lX[v], gmin, gmax, 2);
-		if (i < 0 || j < 0 || k < 0 || i > 10 || j >= 10 || k >= 10)
+		if (i < 0 || j < 0 || k < 0 || i >= 10 || j >= 10 || k >= 10)
 			continue;
 
 		grid[i][j][k].velocity[0] += lV[v][0];

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-07 09:48:59 UTC (rev 51142)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-10-07 10:01:54 UTC (rev 51143)
@@ -3567,10 +3567,10 @@
 			psys->clmd->clothObject = NULL;
 			
 			psys->clmd->sim_parms= newdataadr(fd, psys->clmd->sim_parms);
-			psys->clmd->sim_parms->effector_weights = NULL;
 			psys->clmd->coll_parms= newdataadr(fd, psys->clmd->coll_parms);
 			
 			if (psys->clmd->sim_parms) {
+				psys->clmd->sim_parms->effector_weights = NULL;
 				if (psys->clmd->sim_parms->presets > 10)
 					psys->clmd->sim_parms->presets = 0;
 			}