diff options
| author | Nicholas Rishel <rishel.nick@gmail.com> | 2021-02-16 10:27:21 +0300 |
|---|---|---|
| committer | Nicholas Rishel <rishel.nick@gmail.com> | 2021-02-16 10:27:21 +0300 |
| commit | dd79a715c98147dd1603b867502d3d8a0c8ca777 (patch) | |
| tree | 8025b6f3fbc6449f100a32a7fc1a932c50ccfc10 /source/blender/makesrna | |
| parent | 63fb53ad95dc21cc6f8647e4a157ddefa938e28f (diff) | |
| parent | 2e81f2c01abd21fdbc79625f3f7a0778103fa199 (diff) | |
Merge branch 'blender-v2.92-release'
# Conflicts:
# intern/ghost/intern/GHOST_SystemWin32.cpp
# intern/ghost/intern/GHOST_WindowWin32.cpp
# intern/ghost/intern/GHOST_WindowWin32.h
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 269a242f074..e8dd6e77d1f 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5830,8 +5830,10 @@ static void rna_def_userdef_input(BlenderRNA *brna) prop = RNA_def_property(srna, "tablet_api", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, tablet_api); - RNA_def_property_ui_text( - prop, "Tablet API", "Select the tablet API to use for pressure sensitivity"); + RNA_def_property_ui_text(prop, + "Tablet API", + "Select the tablet API to use for pressure sensitivity (may require " + "restarting Blender for changes to take effect)"); RNA_def_property_update(prop, 0, "rna_userdef_tablet_api_update"); # ifdef WITH_INPUT_NDOF |