Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-02-20 06:31:47 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-20 06:31:47 +0400
commit338f40cce3d0a929d6493037aae95bc53e3267c0 (patch)
treee4967870e6204486477f4b33c525f1e0f8ccfbbf
parent1df068c39a8a4d58272795aff135867f76b2b937 (diff)
NDOF: yaw/pitch were swapped and add timeline fit.
-rw-r--r--source/blender/editors/space_time/time_ops.c1
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_time/time_ops.c b/source/blender/editors/space_time/time_ops.c
index 9067fb6933f..e2e861fda38 100644
--- a/source/blender/editors/space_time/time_ops.c
+++ b/source/blender/editors/space_time/time_ops.c
@@ -192,5 +192,6 @@ void time_keymap(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "TIME_OT_start_frame_set", SKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "TIME_OT_end_frame_set", EKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "TIME_OT_view_all", HOMEKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "TIME_OT_view_all", NDOF_BUTTON_FIT, KM_PRESS, 0, 0);
}
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index cca619c1a55..79baf5015f5 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4081,12 +4081,12 @@ static void rna_def_userdef_input(BlenderRNA *brna)
/* 3D view: yaw */
prop = RNA_def_property(srna, "ndof_rotx_invert_axis", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "ndof_flag", NDOF_ROTX_INVERT_AXIS);
- RNA_def_property_ui_text(prop, "Invert Yaw (X) Axis", "");
+ RNA_def_property_ui_text(prop, "Invert Pitch (X) Axis", "");
/* 3D view: pitch */
prop = RNA_def_property(srna, "ndof_roty_invert_axis", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "ndof_flag", NDOF_ROTY_INVERT_AXIS);
- RNA_def_property_ui_text(prop, "Invert Pitch (Y) Axis", "");
+ RNA_def_property_ui_text(prop, "Invert Yaw (Y) Axis", "");
/* 3D view: roll */
prop = RNA_def_property(srna, "ndof_rotz_invert_axis", PROP_BOOLEAN, PROP_NONE);