[Bf-blender-cvs] [d1b0843a44d] hair_guides_grooming: Merge branch 'hair_guides' into hair_guides_grooming

[Lukas Tönne]

Commit: d1b0843a44dbcfefb2a2701541240b343567454a
Author: Lukas Tönne
Date:   Sat Jun 9 10:17:07 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBd1b0843a44dbcfefb2a2701541240b343567454a

Merge branch 'hair_guides' into hair_guides_grooming

===================================================================



===================================================================