Merge branch 'blender2.7'
[blender.git] / source / blender / editors / sculpt_paint / paint_ops.c
index ed40a22bd78e763cb1a525e794ea328d2b29661e..8a3ed67a3a31c009792a4038dffd1b0647d85593 100644 (file)
 
 #include <stdlib.h>
 #include "BLI_listbase.h"
-#include "BLI_string.h"
 #include "BLI_utildefines.h"
 #include "BLI_math_vector.h"
-#include "BLI_math_color.h"
 
 #include "DNA_customdata_types.h"
 #include "DNA_object_types.h"
@@ -124,7 +122,8 @@ static int brush_add_gpencil_exec(bContext *C, wmOperator *UNUSED(op))
 
        BKE_paint_brush_set(paint, br);
 
-       /* TODO init grease pencil specific data */
+       /* init grease pencil specific data */
+       BKE_brush_init_gpencil_settings(br);
 
        return OPERATOR_FINISHED;
 }
@@ -560,13 +559,13 @@ typedef enum {
 
 typedef enum {
        STENCIL_PRIMARY = 0,
-       STENCIL_SECONDARY = 1
+       STENCIL_SECONDARY = 1,
 } StencilTextureMode;
 
 
 typedef enum {
        STENCIL_CONSTRAINT_X = 1,
-       STENCIL_CONSTRAINT_Y = 2
+       STENCIL_CONSTRAINT_Y = 2,
 } StencilConstraint;
 
 typedef struct {