Commit: 6bd245bb530ad48bfd7038c082bdc1870a18dd91 Author: Aaron Carlisle Date: Thu Dec 29 01:09:11 2016 -0500 Branches: master https://developer.blender.org/rB6bd245bb530ad48bfd7038c082bdc1870a18dd91
Edits to user prefs NDOF UI Small changes: - Remove "NDOF" from each setting - Change tooltip for deadzone - Unrelated typo in cmake comment Reviewers: merwin, Severin Reviewed By: merwin, Severin Tags: #bf_blender, #user_interface Differential Revision: https://developer.blender.org/D2319 =================================================================== M CMakeLists.txt M release/scripts/startup/bl_ui/space_userpref.py M source/blender/makesrna/intern/rna_userdef.c =================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bb1792..8b64f7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -867,7 +867,7 @@ endif() # linux only, not cached set(WITH_BINRELOC OFF) -# MAXOSX only, set to avoid uninitialized +# MACOSX only, set to avoid uninitialized set(EXETYPE "") # C/C++ flags diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index e5b6a94..075a6f8 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1180,11 +1180,18 @@ class USERPREF_PT_input(Panel): col.separator() col.label(text="NDOF Device:") sub = col.column(align=True) - sub.prop(inputs, "ndof_sensitivity", text="NDOF Sensitivity") - sub.prop(inputs, "ndof_orbit_sensitivity", text="NDOF Orbit Sensitivity") - sub.prop(inputs, "ndof_deadzone", text="NDOF Deadzone") + sub.prop(inputs, "ndof_sensitivity", text="Pan Sensitivity") + sub.prop(inputs, "ndof_orbit_sensitivity", text="Orbit Sensitivity") + sub.prop(inputs, "ndof_deadzone", text="Deadzone") + + sub.separator() + col.label(text="Navigation Style:") sub = col.column(align=True) sub.row().prop(inputs, "ndof_view_navigate_method", expand=True) + + sub.separator() + col.label(text="Rotation Style:") + sub = col.column(align=True) sub.row().prop(inputs, "ndof_view_rotate_method", expand=True) row.separator() diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index beb1d89..e68e675 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3287,7 +3287,7 @@ static void rna_def_userdef_walk_navigation(BlenderRNA *brna) prop = RNA_def_property(srna, "use_mouse_reverse", PROP_BOOLEAN, PROP_BOOLEAN); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_WALK_MOUSE_REVERSE); - RNA_def_property_ui_text(prop, "Reverse Mouse", "Reverse the mouse look"); + RNA_def_property_ui_text(prop, "Reverse Mouse", "Reverse the vertical movement of the mouse"); } static void rna_def_userdef_view(BlenderRNA *brna) @@ -4332,7 +4332,7 @@ static void rna_def_userdef_input(BlenderRNA *brna) prop = RNA_def_property(srna, "ndof_deadzone", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Deadzone", "Deadzone of the 3D Mouse"); + RNA_def_property_ui_text(prop, "Deadzone", "Threshold of initial movement needed from the device's rest position"); RNA_def_property_update(prop, 0, "rna_userdef_ndof_deadzone_update"); prop = RNA_def_property(srna, "ndof_pan_yz_swap_axis", PROP_BOOLEAN, PROP_NONE); _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
