diff options
| author | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-07-23 10:46:29 +0300 |
| commit | 2204bfcf9e1c3a38e60830bd97775dd72158f4d6 (patch) | |
| tree | 4f9c827389a23a431f8771b4ca02f410860c0242 /source/blender/blenkernel/intern/softbody.c | |
| parent | f64db794ee690f05905ace0a66d81d2e75549b90 (diff) | |
| parent | 34ad6da4a06ef46cd19945f61cc5f968538546a8 (diff) | |
Merge branch 'master' into temp-gpencil-drw-engine
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 5af3f22cad2..03fbdc24ce4 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -155,8 +155,8 @@ typedef struct SB_thread_context { #define BFF_INTERSECT 1 /* collider edge intrudes face */ #define BFF_CLOSEVERT 2 /* collider vertex repulses face */ -static float SoftHeunTol = - 1.0f; /* humm .. this should be calculated from sb parameters and sizes */ +/* humm .. this should be calculated from sb parameters and sizes. */ +static float SoftHeunTol = 1.0f; /* local prototypes */ static void free_softbody_intern(SoftBody *sb); @@ -251,7 +251,7 @@ static float _final_mass(Object *ob, BodyPoint *bp) /* * for each target object/face the axis aligned bounding box (AABB) is stored * faces parallel to global axes - * so only simple "value" in [min, max] ckecks are used + * so only simple "value" in [min, max] checks are used * float operations still */ |