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

[Lukas Tönne]

Commit: 37a383a4ae52f16da203057f68a57c4e871fdea4
Author: Lukas Tönne
Date:   Wed Jun 6 21:34:51 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB37a383a4ae52f16da203057f68a57c4e871fdea4

Merge branch 'hair_guides' into hair_guides_grooming

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



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