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

[Lukas Tönne]

Commit: d2dfa4791f4c20ddeb4a50a440a620f8b462c9e0
Author: Lukas Tönne
Date:   Thu May 24 11:41:58 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBd2dfa4791f4c20ddeb4a50a440a620f8b462c9e0

Merge branch 'hair_guides' into hair_guides_grooming

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



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