diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-09-05 16:13:10 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-09-05 16:13:10 +0300 |
| commit | 61289c36291199525037e424cf84d5a65629bf58 (patch) | |
| tree | 277829352085016c1778aebff6ac95b2555c3672 /source/blender/gpencil_modifiers/intern | |
| parent | 56a8977e92cf297c95782301c9ac44dd9767b531 (diff) | |
| parent | c598e939ad25dfc3b4eb1c92b16de401bde0d88a (diff) | |
Merge branch 'master' into greasepencil-edit-curve
Conflicts:
source/blender/blenkernel/BKE_gpencil_geom.h
Diffstat (limited to 'source/blender/gpencil_modifiers/intern')
| -rw-r--r-- | source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c index 02a5bf6e4b1..80d26aa43d2 100644 --- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c +++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c @@ -227,7 +227,7 @@ static void panel_draw(const bContext *UNUSED(C), Panel *panel) uiItemR(layout, ptr, "normalize_opacity", 0, NULL, ICON_NONE); const char *text = (RNA_boolean_get(ptr, "normalize_opacity")) ? IFACE_("Strength") : IFACE_("Opacity Factor"); - uiItemR(layout, ptr, "hardness", 0, text, ICON_NONE); + uiItemR(layout, ptr, "factor", 0, text, ICON_NONE); } gpencil_modifier_panel_end(layout, ptr); |