diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 2 | ||||
| -rw-r--r-- | release/scripts/startup/keyingsets_builtins.py | 28 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_constraint.c | 22 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_particle.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_tracking.c | 8 |
5 files changed, 31 insertions, 31 deletions
diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 5b6cc6609e0..73bc5fe5c29 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1578,7 +1578,7 @@ class CLIP_MT_marker_pie(Menu): layout = self.layout pie = layout.menu_pie() # Use Location Tracking - prop = pie.operator("wm.context_set_enum", text="Loc") + prop = pie.operator("wm.context_set_enum", text="Location") prop.data_path = "space_data.clip.tracking.tracks.active.motion_model" prop.value = "Loc" # Use Affine Tracking diff --git a/release/scripts/startup/keyingsets_builtins.py b/release/scripts/startup/keyingsets_builtins.py index bebd10edde3..19d565d10b6 100644 --- a/release/scripts/startup/keyingsets_builtins.py +++ b/release/scripts/startup/keyingsets_builtins.py @@ -85,7 +85,7 @@ class BUILTIN_KSI_Rotation(KeyingSetInfo): class BUILTIN_KSI_Scaling(KeyingSetInfo): """Insert a keyframe on each of the scale channels""" bl_idname = ANIM_KS_SCALING_ID - bl_label = "Scaling" + bl_label = "Scale" # poll - use predefined callback for selected bones/objects poll = keyingsets_utils.RKS_POLL_selected_items @@ -102,7 +102,7 @@ class BUILTIN_KSI_Scaling(KeyingSetInfo): # LocRot class BUILTIN_KSI_LocRot(KeyingSetInfo): """Insert a keyframe on each of the location and rotation channels""" - bl_label = "LocRot" + bl_label = "Location & Rotation" # poll - use predefined callback for selected bones/objects poll = keyingsets_utils.RKS_POLL_selected_items @@ -121,7 +121,7 @@ class BUILTIN_KSI_LocRot(KeyingSetInfo): # LocScale class BUILTIN_KSI_LocScale(KeyingSetInfo): """Insert a keyframe on each of the location and scale channels""" - bl_label = "LocScale" + bl_label = "Location & Scale" # poll - use predefined callback for selected bones/objects poll = keyingsets_utils.RKS_POLL_selected_items @@ -141,7 +141,7 @@ class BUILTIN_KSI_LocScale(KeyingSetInfo): class BUILTIN_KSI_LocRotScale(KeyingSetInfo): """Insert a keyframe on each of the location, rotation, and scale channels""" bl_idname = ANIM_KS_LOC_ROT_SCALE_ID - bl_label = "LocRotScale" + bl_label = "Location, Rotation & Scale" # poll - use predefined callback for selected bones/objects poll = keyingsets_utils.RKS_POLL_selected_items @@ -162,7 +162,7 @@ class BUILTIN_KSI_LocRotScale(KeyingSetInfo): # RotScale class BUILTIN_KSI_RotScale(KeyingSetInfo): """Insert a keyframe on each of the rotation and scale channels""" - bl_label = "RotScale" + bl_label = "Rotation & Scale" # poll - use predefined callback for selected bones/objects poll = keyingsets_utils.RKS_POLL_selected_items @@ -237,7 +237,7 @@ class BUILTIN_KSI_VisualRot(KeyingSetInfo): class BUILTIN_KSI_VisualScaling(KeyingSetInfo): """Insert a keyframe on each of the scale channels, """ \ """taking into account effects of constraints and relationships""" - bl_label = "Visual Scaling" + bl_label = "Visual Scale" bl_options = {'INSERTKEY_VISUAL'} @@ -255,7 +255,7 @@ class BUILTIN_KSI_VisualScaling(KeyingSetInfo): class BUILTIN_KSI_VisualLocRot(KeyingSetInfo): """Insert a keyframe on each of the location and rotation channels, """ \ """taking into account effects of constraints and relationships""" - bl_label = "Visual LocRot" + bl_label = "Visual Location & Rotation" bl_options = {'INSERTKEY_VISUAL'} @@ -275,9 +275,9 @@ class BUILTIN_KSI_VisualLocRot(KeyingSetInfo): # VisualLocScale class BUILTIN_KSI_VisualLocScale(KeyingSetInfo): - """Insert a keyframe on each of the location and scaling channels, """ \ + """Insert a keyframe on each of the location and scale channels, """ \ """taking into account effects of constraints and relationships""" - bl_label = "Visual LocScale" + bl_label = "Visual Location & Scale" bl_options = {'INSERTKEY_VISUAL'} @@ -298,8 +298,8 @@ class BUILTIN_KSI_VisualLocScale(KeyingSetInfo): # VisualLocRotScale class BUILTIN_KSI_VisualLocRotScale(KeyingSetInfo): """Insert a keyframe on each of the location, """ \ - """rotation and scaling channels, taking into account effects of constraints and relationships""" - bl_label = "Visual LocRotScale" + """rotation and scale channels, taking into account effects of constraints and relationships""" + bl_label = "Visual Location, Rotation & Scale" bl_options = {'INSERTKEY_VISUAL'} @@ -321,9 +321,9 @@ class BUILTIN_KSI_VisualLocRotScale(KeyingSetInfo): # VisualRotScale class BUILTIN_KSI_VisualRotScale(KeyingSetInfo): - """Insert a keyframe on each of the rotation and scaling channels, """ \ + """Insert a keyframe on each of the rotation and scale channels, """ \ """taking into account effects of constraints and relationships""" - bl_label = "Visual RotScale" + bl_label = "Visual Rotation & Scale" bl_options = {'INSERTKEY_VISUAL'} @@ -628,7 +628,7 @@ class BUILTIN_KSI_DeltaRotation(KeyingSetInfo): # Delta Scale class BUILTIN_KSI_DeltaScale(KeyingSetInfo): - """Insert keyframes for additional scaling factor""" + """Insert keyframes for additional scale factor""" bl_label = "Delta Scale" # poll - selected objects only (and only if active object in object mode) diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index af300f6e088..d9dd35c4280 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -1228,17 +1228,17 @@ static void rna_def_constraint_kinematic(BlenderRNA *brna) prop = RNA_def_property(srna, "lock_rotation_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_ROT_X); - RNA_def_property_ui_text(prop, "Lock X Rot", "Constraint rotation along X axis"); + RNA_def_property_ui_text(prop, "Lock X Rotation", "Constraint rotation along X axis"); RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Constraint_dependency_update"); prop = RNA_def_property(srna, "lock_rotation_y", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_ROT_Y); - RNA_def_property_ui_text(prop, "Lock Y Rot", "Constraint rotation along Y axis"); + RNA_def_property_ui_text(prop, "Lock Y Rotation", "Constraint rotation along Y axis"); RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Constraint_dependency_update"); prop = RNA_def_property(srna, "lock_rotation_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CONSTRAINT_IK_NO_ROT_Z); - RNA_def_property_ui_text(prop, "Lock Z Rot", "Constraint rotation along Z axis"); + RNA_def_property_ui_text(prop, "Lock Z Rotation", "Constraint rotation along Z axis"); RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Constraint_dependency_update"); prop = RNA_def_property(srna, "use_stretch", PROP_BOOLEAN, PROP_NONE); @@ -2063,8 +2063,8 @@ static void rna_def_constraint_transform(BlenderRNA *brna) PropertyRNA *prop; static const EnumPropertyItem transform_items[] = { - {TRANS_LOCATION, "LOCATION", 0, "Loc", ""}, - {TRANS_ROTATION, "ROTATION", 0, "Rot", ""}, + {TRANS_LOCATION, "LOCATION", 0, "Location", ""}, + {TRANS_ROTATION, "ROTATION", 0, "Rotation", ""}, {TRANS_SCALE, "SCALE", 0, "Scale", ""}, {0, NULL, 0, NULL, NULL}, }; @@ -3036,32 +3036,32 @@ static void rna_def_constraint_pivot(BlenderRNA *brna) {PIVOTCON_AXIS_X_NEG, "NX", 0, - "-X Rot", + "-X Rotation", "Use the pivot point in the negative rotation range around the X-axis"}, {PIVOTCON_AXIS_Y_NEG, "NY", 0, - "-Y Rot", + "-Y Rotation", "Use the pivot point in the negative rotation range around the Y-axis"}, {PIVOTCON_AXIS_Z_NEG, "NZ", 0, - "-Z Rot", + "-Z Rotation", "Use the pivot point in the negative rotation range around the Z-axis"}, {PIVOTCON_AXIS_X, "X", 0, - "X Rot", + "X Rotation", "Use the pivot point in the positive rotation range around the X-axis"}, {PIVOTCON_AXIS_Y, "Y", 0, - "Y Rot", + "Y Rotation", "Use the pivot point in the positive rotation range around the Y-axis"}, {PIVOTCON_AXIS_Z, "Z", 0, - "Z Rot", + "Z Rotation", "Use the pivot point in the positive rotation range around the Z-axis"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 88bc9843bc0..14d84ddb9c8 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -2957,7 +2957,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "tangent_phase", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "tanphase"); RNA_def_property_range(prop, -1.0f, 1.0f); - RNA_def_property_ui_text(prop, "Rot", "Rotate the surface tangent"); + RNA_def_property_ui_text(prop, "Rotation", "Rotate the surface tangent"); RNA_def_property_update(prop, 0, "rna_Particle_reset"); prop = RNA_def_property(srna, "reactor_factor", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 507d06482df..81bbfd8fa14 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -834,22 +834,22 @@ static const EnumPropertyItem tracker_motion_model[] = { {TRACK_MOTION_MODEL_TRANSLATION_ROTATION_SCALE, "LocRotScale", 0, - "LocRotScale", + "Location, Rotation & Scale", "Search for markers that are translated, rotated, and scaled between frames"}, {TRACK_MOTION_MODEL_TRANSLATION_SCALE, "LocScale", 0, - "LocScale", + "Location & Scale", "Search for markers that are translated and scaled between frames"}, {TRACK_MOTION_MODEL_TRANSLATION_ROTATION, "LocRot", 0, - "LocRot", + "Location & Rotation", "Search for markers that are translated and rotated between frames"}, {TRACK_MOTION_MODEL_TRANSLATION, "Loc", 0, - "Loc", + "Location", "Search for markers that are translated between frames"}, {0, NULL, 0, NULL, NULL}, }; |