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

[Lukas Tönne]

Commit: 80b2b28ffaf8727c0ec2259aa98011743d3a7951
Author: Lukas Tönne
Date:   Wed Jun 6 20:41:09 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB80b2b28ffaf8727c0ec2259aa98011743d3a7951

Merge branch 'hair_guides' into hair_guides_grooming

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



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