diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-11-09 17:48:18 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-11-09 17:48:18 +0300 |
| commit | 74ed591f62e7759be6de477ff6cecb21cb7fe2f7 (patch) | |
| tree | b6a5c92d4b5042e60ce9a7399dd326213ae4aa37 /source/blender/makesrna/intern | |
| parent | 3d5efb4335fe3879455099d3866469ac4c0f4c79 (diff) | |
| parent | 4f66cf3b8bb02f2c7c7c235ad7039ba1aa43212a (diff) | |
Merge branch 'master' into geometry-nodes
Diffstat (limited to 'source/blender/makesrna/intern')
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 2ae084d5a5d..1bfa8547ca4 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -5936,13 +5936,6 @@ static void rna_def_userdef_input(BlenderRNA *brna) RNA_def_property_range(prop, 0, 32); RNA_def_property_ui_text( prop, "Wheel Scroll Lines", "Number of lines scrolled at a time with the mouse wheel"); - - prop = RNA_def_property(srna, "use_trackpad_natural", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "uiflag2", USER_TRACKPAD_NATURAL); - RNA_def_property_ui_text(prop, - "Trackpad Natural", - "If your system uses 'natural' scrolling, this option keeps consistent " - "trackpad usage throughout the UI"); } static void rna_def_userdef_keymap(BlenderRNA *brna) |