[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50561] trunk/blender/source/blender: fix for missing NULL check in own recent commit, thanks Gaia for pointing this out.

[Campbell Barton]

Revision: 50561
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50561
Author:   campbellbarton
Date:     2012-09-12 23:19:08 +0000 (Wed, 12 Sep 2012)
Log Message:
-----------
fix for missing NULL check in own recent commit, thanks Gaia for pointing this out.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_bake.c
    trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c

Modified: trunk/blender/source/blender/editors/object/object_bake.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_bake.c	2012-09-12 23:08:49 UTC (rev 50560)
+++ trunk/blender/source/blender/editors/object/object_bake.c	2012-09-12 23:19:08 UTC (rev 50561)
@@ -1377,9 +1377,11 @@
 		}
 
 		/* freed when baking is done, but if its canceled we need to free here */
-		if (ibuf->userdata) {
-			MEM_freeN(ibuf->userdata);
-			ibuf->userdata = NULL;
+		if (ibuf) {
+			if (ibuf->userdata) {
+				MEM_freeN(ibuf->userdata);
+				ibuf->userdata = NULL;
+			}
 		}
 	}
 }

Modified: trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c	2012-09-12 23:08:49 UTC (rev 50560)
+++ trunk/blender/source/blender/modifiers/intern/MOD_particleinstance.c	2012-09-12 23:19:08 UTC (rev 50561)
@@ -152,7 +152,7 @@
 	MPoly *mpoly, *orig_mpoly;
 	MLoop *mloop, *orig_mloop;
 	MVert *mvert, *orig_mvert;
-	int totvert, totpoly, totloop, totedge;
+	int totvert, totpoly, totloop /* , totedge */;
 	int maxvert, maxpoly, maxloop, totpart = 0, first_particle = 0;
 	int k, p, p_skip;
 	short track = ob->trackflag % 3, trackneg, axis = pimd->axis;
@@ -210,7 +210,7 @@
 	totvert = dm->getNumVerts(dm);
 	totpoly = dm->getNumPolys(dm);
 	totloop = dm->getNumLoops(dm);
-	totedge = dm->getNumEdges(dm);
+	/* totedge = dm->getNumEdges(dm); */ /* UNUSED */
 
 	/* count particles */
 	maxvert = 0;