diff options
| author | Ton Roosendaal <ton@blender.org> | 2005-11-30 21:58:10 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2005-11-30 21:58:10 +0300 |
| commit | ec2644fe5cd1fa1a5d845676ce8c577ec55277ba (patch) | |
| tree | c4ba8bb57435a0f7b6d3aeb7fc720abc3fd0e1e0 /source/blender | |
| parent | ce3164e259fd93930532a18153cf98424e8abb10 (diff) | |
Bugfix - own repertoire :)
- Curves without bevel or extrude didn't calculate the Z value for
softbody when the "3d" option for curves was off.
- Typo in softbody.c, for switch of // comments to /* */
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/displist.c | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 4f62748e20e..9273bd8eb71 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -1104,8 +1104,7 @@ static void curve_to_displist(Curve *cu, ListBase *nubase, ListBase *dispbase) v2= bezt->vec[0]; forward_diff_bezier(v1[0], v1[3], v2[0], v2[3], data, nu->resolu, 3); forward_diff_bezier(v1[1], v1[4], v2[1], v2[4], data+1, nu->resolu, 3); - if((nu->type & 8)==0) - forward_diff_bezier(v1[2], v1[5], v2[2], v2[5], data+2, nu->resolu, 3); + forward_diff_bezier(v1[2], v1[5], v2[2], v2[5], data+2, nu->resolu, 3); data+= 3*nu->resolu; } diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index e2b2738ed5f..5b98a3bf794 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1293,7 +1293,7 @@ static void softbody_baked_add(Object *ob, float framenr) dfra= (float)sb->interval; if(sb->totkey==0) { - if(sb->sfra >= sb->efra) return; /* safety, UI or py setting allows * + if(sb->sfra >= sb->efra) return; /* safety, UI or py setting allows */ if(sb->interval<1) sb->interval= 1; /* just be sure */ sb->totkey= 1 + (int)(ceil( (efra-sfra)/dfra ) ); |