diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-05 07:31:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-05 07:31:25 +0300 |
commit | 8b31f6fb2169e7163767e382adbef13587305aca (patch) | |
tree | 23609feb5da08a39f8009eb4390f69e6205fc2b1 /source/blender/blenkernel | |
parent | 8fcc04edce53c5b3b01bf392e1667878ebcce0ef (diff) |
Paint: add BKE_paint_ensure to initialize toolsettings
Each mode had its own logic for initializing paint structs,
move to a single function.
Also remove "BKE_brush_get_gpencil_paint", entering grease pencil
mode is responsible for ensuring the data is created.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_brush.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/brush.c | 14 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 60 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 3 |
5 files changed, 53 insertions, 27 deletions
diff --git a/source/blender/blenkernel/BKE_brush.h b/source/blender/blenkernel/BKE_brush.h index ebfe47c2f99..aca734ae709 100644 --- a/source/blender/blenkernel/BKE_brush.h +++ b/source/blender/blenkernel/BKE_brush.h @@ -62,7 +62,6 @@ void BKE_brush_sculpt_reset(struct Brush *brush); void BKE_brush_gpencil_presets(struct bContext *C); void BKE_brush_update_material(struct Main *bmain, struct Material *ma, struct Brush *exclude_brush); struct Brush *BKE_brush_getactive_gpencil(struct ToolSettings *ts); -struct Paint *BKE_brush_get_gpencil_paint(struct ToolSettings *ts); /* image icon function */ struct ImBuf *get_brush_icon(struct Brush *brush); diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 652b794f937..06e4aad68ec 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -61,6 +61,7 @@ struct Tex; struct ImagePool; struct UnifiedPaintSettings; struct Depsgraph; +struct ToolSettings; enum eOverlayFlags; @@ -124,6 +125,7 @@ void BKE_paint_curve_copy_data( struct PaintCurve *BKE_paint_curve_copy(struct Main *bmain, const struct PaintCurve *pc); void BKE_paint_curve_make_local(struct Main *bmain, struct PaintCurve *pc, const bool lib_local); +bool BKE_paint_ensure(const struct ToolSettings *ts, struct Paint **r_paint); void BKE_paint_init(struct Main *bmain, struct Scene *sce, ePaintMode mode, const char col[3]); void BKE_paint_free(struct Paint *p); void BKE_paint_copy(struct Paint *src, struct Paint *tar, const int flag); diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 94ff7f3f2e5..286ba5f7902 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -193,7 +193,7 @@ void BKE_brush_init_gpencil_settings(Brush *brush) Brush *BKE_brush_add_gpencil(Main *bmain, ToolSettings *ts, const char *name) { Brush *brush; - Paint *paint = BKE_brush_get_gpencil_paint(ts); + Paint *paint = &ts->gp_paint->paint; brush = BKE_brush_add(bmain, name, OB_MODE_GPENCIL_PAINT); BKE_paint_brush_set(paint, brush); @@ -208,16 +208,6 @@ Brush *BKE_brush_add_gpencil(Main *bmain, ToolSettings *ts, const char *name) return brush; } -Paint *BKE_brush_get_gpencil_paint(ToolSettings *ts) -{ - /* alloc paint session */ - if (ts->gp_paint == NULL) { - ts->gp_paint = MEM_callocN(sizeof(GpPaint), "GpPaint"); - } - - return &ts->gp_paint->paint; -} - /* grease pencil cumapping->preset */ typedef enum eGPCurveMappingPreset { GPCURVE_PRESET_PENCIL = 0, @@ -273,7 +263,7 @@ void BKE_brush_gpencil_presets(bContext *C) #define SMOOTH_STROKE_FACTOR 0.9f ToolSettings *ts = CTX_data_tool_settings(C); - Paint *paint = BKE_brush_get_gpencil_paint(ts); + Paint *paint = &ts->gp_paint->paint; Main *bmain = CTX_data_main(C); Brush *brush, *deft; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 7838fb69f1a..e6ef18efcc9 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -570,6 +570,53 @@ eObjectMode BKE_paint_object_mode_from_paint_mode(ePaintMode mode) } } +/** + * Call when entering each respective paint mode. + */ +bool BKE_paint_ensure(const ToolSettings *ts, struct Paint **r_paint) +{ + Paint *paint = NULL; + if (*r_paint) { + /* Note: 'ts->imapaint' is ignored, it's not allocated. */ + BLI_assert( + ELEM(*r_paint, + &ts->gp_paint->paint, + &ts->sculpt->paint, + &ts->vpaint->paint, + &ts->wpaint->paint, + &ts->uvsculpt->paint)); + return true; + } + + if (ELEM(*r_paint, &ts->vpaint->paint, &ts->wpaint->paint)) { + VPaint *data = MEM_callocN(sizeof(*data), __func__); + paint = &data->paint; + } + else if (*r_paint == &ts->sculpt->paint) { + Sculpt *data = MEM_callocN(sizeof(*data), __func__); + paint = &data->paint; + + /* Turn on X plane mirror symmetry by default */ + paint->symmetry_flags |= PAINT_SYMM_X; + + /* Make sure at least dyntopo subdivision is enabled */ + data->flags |= SCULPT_DYNTOPO_SUBDIVIDE | SCULPT_DYNTOPO_COLLAPSE; + } + else if (*r_paint == &ts->gp_paint->paint) { + GpPaint *data = MEM_callocN(sizeof(*data), __func__); + paint = &data->paint; + } + else if (*r_paint == &ts->uvsculpt->paint) { + UvSculpt *data = MEM_callocN(sizeof(*data), __func__); + paint = &data->paint; + } + + paint->flags |= PAINT_SHOW_BRUSH; + + *r_paint = paint; + return false; +} + void BKE_paint_init(Main *bmain, Scene *sce, ePaintMode mode, const char col[3]) { UnifiedPaintSettings *ups = &sce->toolsettings->unified_paint_settings; @@ -1144,18 +1191,9 @@ int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) void BKE_sculpt_toolsettings_data_ensure(struct Scene *scene) { - Sculpt *sd = scene->toolsettings->sculpt; - if (sd == NULL) { - sd = scene->toolsettings->sculpt = MEM_callocN(sizeof(Sculpt), __func__); - - /* Turn on X plane mirror symmetry by default */ - sd->paint.symmetry_flags |= PAINT_SYMM_X; - sd->paint.flags |= PAINT_SHOW_BRUSH; - - /* Make sure at least dyntopo subdivision is enabled */ - sd->flags |= SCULPT_DYNTOPO_SUBDIVIDE | SCULPT_DYNTOPO_COLLAPSE; - } + BKE_paint_ensure(scene->toolsettings, (Paint **)&scene->toolsettings->sculpt); + Sculpt *sd = scene->toolsettings->sculpt; if (!sd->detail_size) { sd->detail_size = 12; } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index a01495eb064..af27103b07e 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -688,9 +688,6 @@ void BKE_scene_init(Scene *sce) sce->toolsettings->imapaint.normal_angle = 80; sce->toolsettings->imapaint.seam_bleed = 2; - /* alloc grease pencil drawing brushes */ - sce->toolsettings->gp_paint = MEM_callocN(sizeof(GpPaint), "GpPaint"); - /* grease pencil multiframe falloff curve */ sce->toolsettings->gp_sculpt.cur_falloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f); CurveMapping *gp_falloff_curve = sce->toolsettings->gp_sculpt.cur_falloff; |