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

[Lukas Tönne]

Commit: 2a22e31e79f6b0d5b733da8e99b779fd6b016676
Author: Lukas Tönne
Date:   Thu May 24 10:52:06 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB2a22e31e79f6b0d5b733da8e99b779fd6b016676

Merge branch 'hair_guides' into hair_guides_grooming

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



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