diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 24df32c1e94..2a2ea7e5648 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -299,7 +299,7 @@ class OBJECT_PT_instancing(ObjectButtonsPanel, Panel): flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False) if ob.instance_type == 'VERTS': - layout.prop(ob, "use_instance_vertices_rotation", text="Rotation") + layout.prop(ob, "use_instance_vertices_rotation", text="Align to Vertex Normal") elif ob.instance_type == 'COLLECTION': col = flow.column() @@ -318,7 +318,7 @@ from .properties_animviz import ( class OBJECT_PT_instancing_size(ObjectButtonsPanel, Panel): - bl_label = "Size" + bl_label = "Scale to Face Size" bl_parent_id = "OBJECT_PT_instancing" @classmethod @@ -337,7 +337,7 @@ class OBJECT_PT_instancing_size(ObjectButtonsPanel, Panel): layout.use_property_split = True layout.active = ob.use_instance_faces_scale - layout.prop(ob, "instance_faces_scale", text="Inherit Scale") + layout.prop(ob, "instance_faces_scale", text="Factor") class OBJECT_PT_motion_paths(MotionPathButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_output.py b/release/scripts/startup/bl_ui/properties_output.py index 388a9235875..fba3b112708 100644 --- a/release/scripts/startup/bl_ui/properties_output.py +++ b/release/scripts/startup/bl_ui/properties_output.py @@ -124,10 +124,10 @@ class RENDER_PT_dimensions(RenderOutputButtonsPanel, Panel): col.prop(rd, "pixel_aspect_y", text="Y") col = layout.column(align=True) - col.prop(rd, "use_border", text="Border") + col.prop(rd, "use_border") sub = col.column(align=True) sub.active = rd.use_border - sub.prop(rd, "use_crop_to_border", text="Crop") + sub.prop(rd, "use_crop_to_border") col = layout.column(align=True) col.prop(scene, "frame_start", text="Frame Start") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 2fbaa9405ec..86a4532e1ea 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -630,7 +630,7 @@ class VIEW3D_MT_view(Menu): layout.separator() layout.operator_context = 'INVOKE_REGION_WIN' - layout.menu("VIEW3D_MT_view_borders", text="View Borders") + layout.menu("VIEW3D_MT_view_regions", text="View Regions") layout.separator() @@ -784,13 +784,13 @@ class VIEW3D_MT_view_align_selected(Menu): props.type = 'LEFT' -class VIEW3D_MT_view_borders(Menu): - bl_label = "View Borders" +class VIEW3D_MT_view_regions(Menu): + bl_label = "View Regions" def draw(self, context): layout = self.layout - layout.operator("view3d.clip_border", text="Clipping Border...") - layout.operator("view3d.render_border", text="Render Border...") + layout.operator("view3d.clip_border", text="Clipping Region...") + layout.operator("view3d.render_border", text="Render Region...") layout.separator() @@ -5784,7 +5784,7 @@ classes = ( VIEW3D_MT_view_align, VIEW3D_MT_view_align_selected, VIEW3D_MT_view_viewpoint, - VIEW3D_MT_view_borders, + VIEW3D_MT_view_regions, VIEW3D_MT_select_object, VIEW3D_MT_select_object_more_less, VIEW3D_MT_select_pose, diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 07470bce899..b1dd04b862b 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -3764,8 +3764,8 @@ static int render_border_exec(bContext *C, wmOperator *op) void IMAGE_OT_render_border(wmOperatorType *ot) { /* identifiers */ - ot->name = "Render Border"; - ot->description = "Set the boundaries of the border render and enable border render"; + ot->name = "Render Region"; + ot->description = "Set the boundaries of the render region and enable render region"; ot->idname = "IMAGE_OT_render_border"; /* api callbacks */ @@ -3797,8 +3797,8 @@ static int clear_render_border_exec(bContext *C, wmOperator *UNUSED(op)) void IMAGE_OT_clear_render_border(wmOperatorType *ot) { /* identifiers */ - ot->name = "Clear Render Border"; - ot->description = "Clear the boundaries of the border render and disable border render"; + ot->name = "Clear Render Region"; + ot->description = "Clear the boundaries of the render region and disable render region"; ot->idname = "IMAGE_OT_clear_render_border"; /* api callbacks */ diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index fe0dfc6bc31..fdafa064d4a 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3293,7 +3293,7 @@ static int render_border_exec(bContext *C, wmOperator *op) void VIEW3D_OT_render_border(wmOperatorType *ot) { /* identifiers */ - ot->name = "Set Render Border"; + ot->name = "Set Render Region"; ot->description = "Set the boundaries of the border render and enable border render"; ot->idname = "VIEW3D_OT_render_border"; @@ -3353,7 +3353,7 @@ static int clear_render_border_exec(bContext *C, wmOperator *UNUSED(op)) void VIEW3D_OT_clear_render_border(wmOperatorType *ot) { /* identifiers */ - ot->name = "Clear Render Border"; + ot->name = "Clear Render Region"; ot->description = "Clear the boundaries of the border render and disable border render"; ot->idname = "VIEW3D_OT_clear_render_border"; @@ -4599,8 +4599,8 @@ void VIEW3D_OT_clip_border(wmOperatorType *ot) { /* identifiers */ - ot->name = "Clipping Border"; - ot->description = "Set the view clipping border"; + ot->name = "Clipping Region"; + ot->description = "Set the view clipping region"; ot->idname = "VIEW3D_OT_clip_border"; /* api callbacks */ diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 2a0dde460dd..622a4b7c01b 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -2608,12 +2608,12 @@ static void rna_def_object(BlenderRNA *brna) prop = RNA_def_property(srna, "use_instance_vertices_rotation", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIROT); - RNA_def_property_ui_text(prop, "Instance Verts Rotation", "Rotate instance according to vertex normal"); + RNA_def_property_ui_text(prop, "Orient with Normals", "Rotate instance according to vertex normal"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "use_instance_faces_scale", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "transflag", OB_DUPLIFACES_SCALE); - RNA_def_property_ui_text(prop, "Instance Faces Inherit Scale", "Scale instance based on face size"); + RNA_def_property_ui_text(prop, "Scale to Face Sizes", "Scale instance based on face size"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update"); prop = RNA_def_property(srna, "instance_faces_scale", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 93bbc214085..ea8ed296cc5 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -5142,41 +5142,41 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop = RNA_def_property(srna, "use_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_BORDER); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Border", "Render a user-defined border region, within the frame size "); + RNA_def_property_ui_text(prop, "Render Region", "Render a user-defined render region, within the frame size"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "border_min_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.xmin"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Border Minimum X", "Minimum X value for the render border"); + RNA_def_property_ui_text(prop, "Region Minimum X", "Minimum X value for the render region"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "border_min_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.ymin"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Border Minimum Y", "Minimum Y value for the render border"); + RNA_def_property_ui_text(prop, "Region Minimum Y", "Minimum Y value for the render region"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "border_max_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.xmax"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Border Maximum X", "Maximum X value for the render border"); + RNA_def_property_ui_text(prop, "Region Maximum X", "Maximum X value for the render region"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "border_max_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "border.ymax"); RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Border Maximum Y", "Maximum Y value for the render border"); + RNA_def_property_ui_text(prop, "Region Maximum Y", "Maximum Y value for the render region"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_crop_to_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_CROP); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Crop to Border", "Crop the rendered frame to the defined border size"); + RNA_def_property_ui_text(prop, "Crop to Render Region", "Crop the rendered frame to the defined render region size"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_placeholder", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 4ff9ecd23ae..4bd0fc37cc5 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -3086,32 +3086,32 @@ static void rna_def_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "use_render_border", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_RENDER_BORDER); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Render Border", "Use a region within the frame size for rendered viewport " + RNA_def_property_ui_text(prop, "Render Region", "Use a region within the frame size for rendered viewport" "(when not viewing through the camera)"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_min_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.xmin"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Minimum X", "Minimum X value for the render border"); + RNA_def_property_ui_text(prop, "Region Minimum X", "Minimum X value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_min_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.ymin"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Minimum Y", "Minimum Y value for the render border"); + RNA_def_property_ui_text(prop, "Region Minimum Y", "Minimum Y value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_max_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.xmax"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Maximum X", "Maximum X value for the render border"); + RNA_def_property_ui_text(prop, "Region Maximum X", "Maximum X value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "render_border_max_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "render_border.ymax"); RNA_def_property_range(prop, 0.0f, 1.0f); - RNA_def_property_ui_text(prop, "Border Maximum Y", "Maximum Y value for the render border"); + RNA_def_property_ui_text(prop, "Region Maximum Y", "Maximum Y value for the render region"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "lock_object", PROP_POINTER, PROP_NONE);