diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:23:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 18:24:20 +0300 |
| commit | 9a11aeb300cef2eef5df3b606468a6bcdaca3550 (patch) | |
| tree | 7265ef366b503021c8d18497d04b49a374309829 /source/blender/blenkernel/intern/constraint.c | |
| parent | 3a14a0381288ae9f49d1ab489a250cd29a00e771 (diff) | |
| parent | 95eb9f22e69622c5817707fa9534521613e7d7cc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/constraint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/constraint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index b070ccdd4eb..a759d0fa3f2 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -2630,7 +2630,7 @@ static void distlimit_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t /* if soft-distance is enabled, start fading once owner is dist+softdist from the target */ else if (data->flag & LIMITDIST_USESOFT) { if (dist <= (data->dist + data->soft)) { - + /* pass */ } } } |