diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2020-04-27 11:49:33 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2020-04-27 11:49:33 +0300 |
commit | 7300e8a9fe8f82204ffa30e496578ccc04ff7891 (patch) | |
tree | f59320cb71bccce41beca7f0f616becc9d7220bb | |
parent | bb1e794d5800b450b53161e9cd9a682c2d6816b1 (diff) |
GPencil: Change defaults for Gradient materials
The old values did not display a valid gradient by default.
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index f641531d577..1b21ff9b36e 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -168,9 +168,11 @@ void BKE_gpencil_material_attr_init(Material *ma) /* set basic settings */ gp_style->stroke_rgba[3] = 1.0f; gp_style->fill_rgba[3] = 1.0f; - ARRAY_SET_ITEMS(gp_style->mix_rgba, 1.0f, 1.0f, 1.0f, 0.2f); + ARRAY_SET_ITEMS(gp_style->mix_rgba, 1.0f, 1.0f, 1.0f, 1.0f); ARRAY_SET_ITEMS(gp_style->texture_scale, 1.0f, 1.0f); + gp_style->texture_offset[0] = -0.5f; gp_style->texture_pixsize = 100.0f; + gp_style->mix_factor = 0.5f; gp_style->flag |= GP_MATERIAL_STROKE_SHOW; } diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 19606b92479..8343895c8dd 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -433,10 +433,21 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) } ma->gp_style->mode = GP_MATERIAL_MODE_SQUARE; + /* Change Solid Stroke settings. */ + ma = BLI_findstring(&bmain->materials, "Solid Stroke", offsetof(ID, name) + 2); + if (ma != NULL) { + ma->gp_style->mix_rgba[3] = 1.0f; + ma->gp_style->texture_offset[0] = -0.5f; + ma->gp_style->mix_factor = 0.5f; + } + /* Change Solid Fill settings. */ ma = BLI_findstring(&bmain->materials, "Solid Fill", offsetof(ID, name) + 2); if (ma != NULL) { ma->gp_style->flag &= ~GP_MATERIAL_STROKE_SHOW; + ma->gp_style->mix_rgba[3] = 1.0f; + ma->gp_style->texture_offset[0] = -0.5f; + ma->gp_style->mix_factor = 0.5f; } Object *ob = BLI_findstring(&bmain->objects, "Stroke", offsetof(ID, name) + 2); |