diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:12:52 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 09:21:34 +0300 |
| commit | 55e719ec35a10c3f9e7231dee13d4b05aad7d965 (patch) | |
| tree | 563ed5b1b27e9613de8384da90197ce2c3e1924b /source/blender/blenkernel/intern/softbody.c | |
| parent | c279f879ab86e03dff0dbfd3a36b14bebb4956f9 (diff) | |
| parent | d7f55c4ff58f87b80f0ce2fa43ce2f7cd2b72675 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index e3bd6f9860f..4c1555e9451 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -2119,7 +2119,7 @@ static int _softbody_calc_forces_slice_in_a_thread(Scene *scene, Object *ob, flo }/* existing spring list */ }/*any edges*/ /* ---springs */ - }/*omit on snap */ + }/*omit on snap */ }/*loop all bp's*/ return 0; /*done fine*/ } @@ -2469,7 +2469,7 @@ static void softbody_calc_forces(struct Depsgraph *depsgraph, Scene *scene, Obje }/* existing spring list */ }/*any edges*/ /* ---springs */ - }/*omit on snap */ + }/*omit on snap */ }/*loop all bp's*/ |