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

[Lukas Tönne]

Commit: 33eaf7f495e9f591964bbca5474651342f1ac643
Author: Lukas Tönne
Date:   Wed May 23 09:04:55 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB33eaf7f495e9f591964bbca5474651342f1ac643

Merge branch 'hair_guides' into hair_guides_grooming

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



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