diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2019-08-30 15:19:07 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2019-08-30 15:26:39 +0300 |
| commit | d5d3dc418912863b172ef9f79f9991bb9d46bea8 (patch) | |
| tree | d3aeb45c89025a1c5c0cabdf6ca4d3746115b848 /source/blender/blenkernel/BKE_gpencil.h | |
| parent | 4608220c9b3c0adfdab3cd6994d29c0ced748794 (diff) | |
GPencil: Use default material when slot material is empty
When a material slot is empty, the default material is used.
The default color used is Gray to get a good contrast in dense scenes with dark and white background.
Reviewers: brecht, dfelinto, mendio, pepeland
Differential Revision: https://developer.blender.org/D5625
Diffstat (limited to 'source/blender/blenkernel/BKE_gpencil.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_gpencil.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h index f1cf87ea1b5..75e98ee31de 100644 --- a/source/blender/blenkernel/BKE_gpencil.h +++ b/source/blender/blenkernel/BKE_gpencil.h @@ -155,7 +155,7 @@ struct Material *BKE_gpencil_brush_material_get(struct Brush *brush); void BKE_gpencil_brush_material_set(struct Brush *brush, struct Material *material); /* Object */ -struct Material *BKE_gpencil_object_material_ensure_active(struct Main *bmain, struct Object *ob); +struct Material *BKE_gpencil_object_material_ensure_active(struct Object *ob); struct Material *BKE_gpencil_object_material_ensure_from_brush(struct Main *bmain, struct Object *ob, struct Brush *brush); @@ -179,8 +179,7 @@ struct Material *BKE_gpencil_object_material_ensure_from_active_input_toolsettin struct Material *BKE_gpencil_object_material_ensure_from_active_input_brush(struct Main *bmain, struct Object *ob, struct Brush *brush); -struct Material *BKE_gpencil_object_material_ensure_from_active_input_material(struct Main *bmain, - struct Object *ob); +struct Material *BKE_gpencil_object_material_ensure_from_active_input_material(struct Object *ob); /* object boundbox */ bool BKE_gpencil_data_minmax(const struct bGPdata *gpd, float r_min[3], float r_max[3]); |