diff options
author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/editors/interface/interface_eyedropper_gpencil_color.c | |
parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper_gpencil_color.c')
-rw-r--r-- | source/blender/editors/interface/interface_eyedropper_gpencil_color.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c index 978d8ac09de..aa5b4d2c255 100644 --- a/source/blender/editors/interface/interface_eyedropper_gpencil_color.c +++ b/source/blender/editors/interface/interface_eyedropper_gpencil_color.c @@ -106,8 +106,11 @@ static void eyedropper_gpencil_exit(bContext *C, wmOperator *op) MEM_SAFE_FREE(op->customdata); } -static void eyedropper_add_material( - bContext *C, float col_conv[4], const bool only_stroke, const bool only_fill, const bool both) +static void eyedropper_add_material(bContext *C, + const float col_conv[4], + const bool only_stroke, + const bool only_fill, + const bool both) { Main *bmain = CTX_data_main(C); Object *ob = CTX_data_active_object(C); @@ -193,7 +196,7 @@ static void eyedropper_add_material( } /* Create a new palette color and palette if needed. */ -static void eyedropper_add_palette_color(bContext *C, float col_conv[4]) +static void eyedropper_add_palette_color(bContext *C, const float col_conv[4]) { Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); |