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

Lukas Tönne noreply at git.blender.org
Fri Jun 29 14:44:28 CEST 2018


Commit: e4cc8ecd07377f58fd11301874cb1c9da44ae2bf
Author: Lukas Tönne
Date:   Fri Jun 29 13:40:33 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rBe4cc8ecd07377f58fd11301874cb1c9da44ae2bf

Merge branch 'hair_guides' into hair_guides_grooming

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



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

diff --cc source/blender/makesrna/RNA_access.h
index afb8c3c0819,80df8347961..db94fffe390
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@@ -281,10 -280,8 +280,11 @@@ extern StructRNA RNA_GPencilSculptBrush
  extern StructRNA RNA_GaussianBlurSequence;
  extern StructRNA RNA_GlowSequence;
  extern StructRNA RNA_GreasePencil;
 +extern StructRNA RNA_Groom;
 +extern StructRNA RNA_GroomBundle;
 +extern StructRNA RNA_GroomRegion;
  extern StructRNA RNA_HairGroup;
+ extern StructRNA RNA_HairModifier;
  extern StructRNA RNA_HairPattern;
  extern StructRNA RNA_Header;
  extern StructRNA RNA_HemiLamp;



More information about the Bf-blender-cvs mailing list