[Bf-blender-cvs] [63d0a78] GPencil_Editing_Stage3: GPencil Sculpt: Added defines for a bunch of new brush types to be added

Joshua Leung noreply at git.blender.org
Fri Jul 10 15:42:27 CEST 2015


Commit: 63d0a7862452771998226e5a9ff1539425c5cb1b
Author: Joshua Leung
Date:   Sat Jul 11 01:24:53 2015 +1200
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB63d0a7862452771998226e5a9ff1539425c5cb1b

GPencil Sculpt: Added defines for a bunch of new brush types to be added

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

M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 12e85e1..150f23d 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1070,7 +1070,10 @@ typedef enum eGP_EditBrush_Types {
 	GP_EDITBRUSH_TYPE_SMOOTH    = 0,
 	GP_EDITBRUSH_TYPE_THICKNESS = 1,
 	GP_EDITBRUSH_TYPE_GRAB      = 2,
-	GP_EDITBRUSH_TYPE_RANDOMISE = 3,
+	GP_EDITBRUSH_TYPE_PUSH      = 3,
+	GP_EDITBRUSH_TYPE_TWIST     = 4,
+	GP_EDITBRUSH_TYPE_PINCH     = 5,
+	GP_EDITBRUSH_TYPE_RANDOMISE = 6,
 	
 	TOT_GP_EDITBRUSH_TYPES
 } eGP_EditBrush_Types;
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 3f707ed..3abdcb8 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -64,6 +64,9 @@ static EnumPropertyItem gpencil_sculpt_brush_items[] = {
 	{GP_EDITBRUSH_TYPE_SMOOTH, "SMOOTH", 0, "Smooth", "Smooth stroke points"},
 	{GP_EDITBRUSH_TYPE_THICKNESS, "THICKNESS", 0, "Thickness", "Adjust thickness of strokes"},
 	{GP_EDITBRUSH_TYPE_GRAB, "GRAB", 0, "Grab", "Translate the set of points initially within the brush circle"},
+	{GP_EDITBRUSH_TYPE_PUSH, "PUSH", 0, "Push", "Move points out of the way, as if combing them"},
+	{GP_EDITBRUSH_TYPE_TWIST, "TWIST", 0, "Twist", "Rotate points around the midpoint of the brush"},
+	{GP_EDITBRUSH_TYPE_PINCH, "PINCH", 0, "Pinch", "Pull points towards the midpoint of the brush"},
 	{GP_EDITBRUSH_TYPE_RANDOMISE, "RANDOMISE", 0, "Randomise", "Introduce jitter/randomness into strokes"},
 	{0, NULL, 0, NULL, NULL}
 };




More information about the Bf-blender-cvs mailing list