diff options
| author | Antonioya <blendergit@gmail.com> | 2019-03-25 19:02:42 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-03-25 19:06:07 +0300 |
| commit | 7021bd527380b4d87cf48057f0039509326b03dd (patch) | |
| tree | 55126437da17d736a789d236c8a98d199a1e6260 /source/blender/blenkernel/BKE_gpencil.h | |
| parent | 84240ebb3ebde58f6bfba256e49d37697fb6bc9f (diff) | |
GPencil: Only brushes with pinned materials have materials
Using GP_BRUSH_MATERIAL_PINNED to switch between active material and brush material, instead of updating all brushes on active material changes. This will allow brushes to have no material and therefore to not inflate the user count.
This fix T62465.
Patch contributed by @matc
Reviewers: @brecht @antoniov @billreynish @mendio
Diffstat (limited to 'source/blender/blenkernel/BKE_gpencil.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_gpencil.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index 353ba61b70d..e94ba27a8ea 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -132,6 +132,21 @@ void BKE_gpencil_layer_setactive(struct bGPdata *gpd, struct bGPDlayer *active); void BKE_gpencil_layer_delete(struct bGPdata *gpd, struct bGPDlayer *gpl); struct Material *BKE_gpencil_get_material_from_brush(struct Brush *brush); +void BKE_gpencil_brush_set_material(struct Brush *brush, struct Material *material); + +struct Material *BKE_gpencil_handle_brush_material(struct Main *bmain, struct Object *ob, struct Brush *brush); +int BKE_gpencil_handle_material(struct Main *bmain, struct Object *ob, struct Material *material); + +struct Material *BKE_gpencil_handle_new_material(struct Main *bmain, struct Object *ob, const char *name, int *r_index); + +struct Material *BKE_gpencil_get_material_for_brush(struct Object *ob, struct Brush *brush); +int BKE_gpencil_get_material_index_for_brush(struct Object *ob, struct Brush *brush); + +struct Material *BKE_gpencil_current_input_toolsettings_material(struct Main *bmain, struct Object *ob, struct ToolSettings *ts); +struct Material *BKE_gpencil_current_input_brush_material(struct Main *bmain, struct Object *ob, struct Brush *brush); +struct Material *BKE_gpencil_current_input_material(struct Main *bmain, struct Object *ob); + + struct Material *BKE_gpencil_material_ensure(struct Main *bmain, struct Object *ob); /* object boundbox */ |