Bugfix: Sofbody baking included the 'start frame' for the object in

calculus, causing empty keys in the bake, and crashes.

1 files changed, 3 insertions, 1 deletions

diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 0bbd7d3496d..79418ed92eb 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -1655,7 +1655,9 @@ static void softbody_baked_add(Object *ob, float framenr)
 	
 	/* convert cfra time to system time */
 	sfra= (float)sb->sfra;
+	fac1= ob->sf; ob->sf= 0.0f;	/* disable startframe */
 	cfra= bsystem_time(ob, NULL, framenr, 0.0);
+	ob->sf= fac1;
 	efra= (float)sb->efra;
 	dfra= (float)sb->interval;
 	
@@ -1673,7 +1675,7 @@ static void softbody_baked_add(Object *ob, float framenr)
 	/* now find out if we have to store a key */
 	
 	/* offset in keys array */
-	if(cfra==efra) {
+	if(cfra>=(efra)) {
 		ofs1= sb->totkey-1;
 		fac1= 0.0;
 	}