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

[Lukas Tönne]

Commit: 5cdfa31e277e240ae4ac09336befd543de543324
Author: Lukas Tönne
Date:   Thu May 24 10:33:12 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB5cdfa31e277e240ae4ac09336befd543de543324

Merge branch 'hair_guides' into hair_guides_grooming

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



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