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

[Lukas Tönne]

Commit: 0fe4cae57bf22cb9b256ef541b18afbe0fafa353
Author: Lukas Tönne
Date:   Fri Jun 15 06:48:57 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB0fe4cae57bf22cb9b256ef541b18afbe0fafa353

Merge branch 'hair_guides' into hair_guides_grooming

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



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