diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-27 17:47:53 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-27 17:47:53 +0300 |
| commit | cd8baf871ba181c9f58f7acc34a69292dc99cd50 (patch) | |
| tree | 6908d96931bee90ff295103ce5d9dc5f9e36cfba /source/blender/blenkernel | |
| parent | 96e878b6cc717d44b1b27ea56a83589acb321c0e (diff) | |
| parent | 9c87f0f2c85598e2831550df4ed05c23d82f4f19 (diff) | |
Merge branch 'alembic' into gooseberry
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/cache_library.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c index 46cc2aa40d9..2fe0e8f96fd 100644 --- a/source/blender/blenkernel/intern/cache_library.c +++ b/source/blender/blenkernel/intern/cache_library.c @@ -1864,12 +1864,14 @@ static bool haircut_find_first_strand_cut(HaircutCacheModifier *hmd, HaircutCach } if (found_cut) { - if (r_cutoff) *r_cutoff = cutoff + lambda_min; + cutoff += lambda_min; + if (r_cutoff) *r_cutoff = cutoff; return true; } + else + cutoff += 1.0f; } - cutoff += 1.0f; vprev = it_vert.index; } |