diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-03 19:58:41 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-06 14:26:46 +0300 |
commit | e0a4dc6a794670429dc12cd78ae9d19e50ac2a8e (patch) | |
tree | 6a5f2f56b1442a691868df579048064bda63b4a7 | |
parent | 1450a375553d4549276f9098a7e43f740059489d (diff) |
UI / Python: rename X-Ray to In Front, Draw to Display.
See T56648.
30 files changed, 222 insertions, 217 deletions
diff --git a/doc/python_api/examples/bpy.types.Menu.3.py b/doc/python_api/examples/bpy.types.Menu.3.py index 9fe39535bbf..285052f2e20 100644 --- a/doc/python_api/examples/bpy.types.Menu.3.py +++ b/doc/python_api/examples/bpy.types.Menu.3.py @@ -7,7 +7,7 @@ to perform the common task of managing presets. This example shows how you can add a preset menu. -This example uses the object draw options, +This example uses the object display options, however you can use properties defined by your own scripts too. """ @@ -16,18 +16,18 @@ from bpy.types import Operator, Menu from bl_operators.presets import AddPresetBase -class OBJECT_MT_draw_presets(Menu): - bl_label = "Object Draw Presets" - preset_subdir = "object/draw" +class OBJECT_MT_display_presets(Menu): + bl_label = "Object Display Presets" + preset_subdir = "object/display" preset_operator = "script.execute_preset" - draw = Menu.draw_preset + display = Menu.display_preset -class AddPresetObjectDraw(AddPresetBase, Operator): - '''Add a Object Draw Preset''' - bl_idname = "camera.object_draw_preset_add" - bl_label = "Add Object Draw Preset" - preset_menu = "OBJECT_MT_draw_presets" +class AddPresetObjectDisplay(AddPresetBase, Operator): + '''Add a Object Display Preset''' + bl_idname = "camera.object_display_preset_add" + bl_label = "Add Object Display Preset" + preset_menu = "OBJECT_MT_display_presets" # variable used for all preset values preset_defines = [ @@ -36,31 +36,31 @@ class AddPresetObjectDraw(AddPresetBase, Operator): # properties to store in the preset preset_values = [ - "obj.draw_type", + "obj.display_type", "obj.show_bounds", - "obj.draw_bounds_type", + "obj.display_bounds_type", "obj.show_name", "obj.show_axis", "obj.show_wire", ] # where to store the preset - preset_subdir = "object/draw" + preset_subdir = "object/display" -# Draw into an existing panel +# Display into an existing panel def panel_func(self, context): layout = self.layout row = layout.row(align=True) - row.menu(OBJECT_MT_draw_presets.__name__, text=OBJECT_MT_draw_presets.bl_label) - row.operator(AddPresetObjectDraw.bl_idname, text="", icon='ZOOMIN') - row.operator(AddPresetObjectDraw.bl_idname, text="", icon='ZOOMOUT').remove_active = True + row.menu(OBJECT_MT_display_presets.__name__, text=OBJECT_MT_display_presets.bl_label) + row.operator(AddPresetObjectDisplay.bl_idname, text="", icon='ZOOMIN') + row.operator(AddPresetObjectDisplay.bl_idname, text="", icon='ZOOMOUT').remove_active = True classes = ( - OBJECT_MT_draw_presets, - AddPresetObjectDraw, + OBJECT_MT_display_presets, + AddPresetObjectDisplay, ) diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index a1fd153b4fd..0bf90297263 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -134,9 +134,9 @@ static bool ObtainCacheParticleData(Mesh *mesh, if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) { int shader = clamp(b_part.material()-1, 0, mesh->used_shaders.size()-1); - int draw_step = background ? b_part.render_step() : b_part.draw_step(); + int display_step = background ? b_part.render_step() : b_part.display_step(); int totparts = b_psys.particles.length(); - int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f); + int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.display_percentage() / 100.0f); int totcurves = totchild; if(b_part.child_type() == 0 || totchild == 0) @@ -145,7 +145,7 @@ static bool ObtainCacheParticleData(Mesh *mesh, if(totcurves == 0) continue; - int ren_step = (1 << draw_step) + 1; + int ren_step = (1 << display_step) + 1; if(b_part.kink() == BL::ParticleSettings::kink_SPIRAL) ren_step += b_part.kink_extra_steps(); @@ -227,7 +227,7 @@ static bool ObtainCacheParticleUV(Mesh *mesh, if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) { int totparts = b_psys.particles.length(); - int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f); + int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.display_percentage() / 100.0f); int totcurves = totchild; if(b_part.child_type() == 0 || totchild == 0) @@ -286,7 +286,7 @@ static bool ObtainCacheParticleVcol(Mesh *mesh, if((b_part.render_type() == BL::ParticleSettings::render_type_PATH) && (b_part.type() == BL::ParticleSettings::type_HAIR)) { int totparts = b_psys.particles.length(); - int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.draw_percentage() / 100.0f); + int totchild = background ? b_psys.child_particles.length() : (int)((float)b_psys.child_particles.length() * (float)b_part.display_percentage() / 100.0f); int totcurves = totchild; if(b_part.child_type() == 0 || totchild == 0) diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index 36dc1b46590..d0b0fccf65e 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -347,7 +347,7 @@ class QuickSmoke(Operator): obj.modifiers[-1].flow_settings.smoke_flow_type = self.style if not self.show_flows: - obj.draw_type = 'WIRE' + obj.display_type = 'WIRE' # store bounding box min/max for the domain object obj_bb_minmax(obj, min_co, max_co) @@ -472,7 +472,7 @@ class QuickFluid(Operator): obj.hide_render = not self.show_flows if not self.show_flows: - obj.draw_type = 'WIRE' + obj.display_type = 'WIRE' # store bounding box min/max for the domain object obj_bb_minmax(obj, min_co, max_co) diff --git a/release/scripts/startup/bl_operators/rigidbody.py b/release/scripts/startup/bl_operators/rigidbody.py index 46f3d0a1436..b98538dd20b 100644 --- a/release/scripts/startup/bl_operators/rigidbody.py +++ b/release/scripts/startup/bl_operators/rigidbody.py @@ -270,7 +270,7 @@ class ConnectRigidBodies(Operator): bpy.ops.rigidbody.constraint_add() con_obj = context.active_object - con_obj.empty_draw_type = 'ARROWS' + con_obj.empty_display_type = 'ARROWS' con = con_obj.rigid_body_constraint con.type = self.con_type diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index d29b2d88d98..4f0f18889fc 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -75,7 +75,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel): ob = context.object arm = context.armature - layout.row().prop(arm, "draw_type", expand=True) + layout.row().prop(arm, "display_type", expand=True) layout.use_property_split = True @@ -85,7 +85,7 @@ class DATA_PT_display(ArmatureButtonsPanel, Panel): col.prop(arm, "show_bone_custom_shapes", text="Shapes") col.prop(arm, "show_group_colors", text="Group Colors") if ob: - col.prop(ob, "show_x_ray", text="In Front") + col.prop(ob, "show_in_front", text="In Front") col.prop(arm, "use_deform_delay", text="Delay Refresh") diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 0ecce3b2f78..e097cd269f3 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -345,7 +345,7 @@ class DATA_PT_camera_background_image(CameraButtonsPanel, Panel): if has_bg: col = box.column() col.prop(bg, "alpha", slider=True) - col.row().prop(bg, "draw_depth", expand=True) + col.row().prop(bg, "display_depth", expand=True) col.row().prop(bg, "frame_method", expand=True) @@ -380,7 +380,7 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel): col = layout.column(align=True) col.separator() - col.prop(cam, "draw_size", text="Size") + col.prop(cam, "display_size", text="Size") col.separator() col.prop(cam, "show_passepartout", text="Passepartout") sub = col.column() diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index ab12d0f5c5f..013921584f1 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -40,9 +40,9 @@ class DATA_PT_empty(DataButtonsPanel, Panel): ob = context.object - layout.prop(ob, "empty_draw_type", text="Display As") + layout.prop(ob, "empty_display_type", text="Display As") - if ob.empty_draw_type == 'IMAGE': + if ob.empty_display_type == 'IMAGE': layout.template_ID(ob, "data", open="image.open", unlink="object.unlink_data") layout.template_image(ob, "data", ob.image_user, compact=True) @@ -56,7 +56,7 @@ class DATA_PT_empty(DataButtonsPanel, Panel): layout.separator() - layout.prop(ob, "empty_draw_size", text="Size") + layout.prop(ob, "empty_display_size", text="Size") classes = ( diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py index 3eec80ad802..81c9d93fce3 100644 --- a/release/scripts/startup/bl_ui/properties_data_gpencil.py +++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py @@ -366,7 +366,7 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel): gpl = context.active_gpencil_layer layout.prop(gpd, "xray_mode", text="Depth Ordering") - layout.prop(ob, "empty_draw_size", text="Marker Size") + layout.prop(ob, "empty_display_size", text="Marker Size") col = layout.column(align=True) col.prop(gpd, "show_constant_thickness") diff --git a/release/scripts/startup/bl_ui/properties_data_lightprobe.py b/release/scripts/startup/bl_ui/properties_data_lightprobe.py index 2de9a85e507..b1e91d298c8 100644 --- a/release/scripts/startup/bl_ui/properties_data_lightprobe.py +++ b/release/scripts/startup/bl_ui/properties_data_lightprobe.py @@ -155,7 +155,7 @@ class DATA_PT_lightprobe_display(DataButtonsPanel, Panel): col = layout.column() if probe.type == 'PLANAR': - col.prop(ob, "empty_draw_size", text="Arrow Size") + col.prop(ob, "empty_display_size", text="Arrow Size") col.prop(probe, "show_data") if probe.type in {'GRID', 'CUBEMAP'}: diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index bf32ebfc55a..8f19d36f6b2 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -219,7 +219,7 @@ class MASK_PT_display: space_data = context.space_data row = layout.row(align=True) row.prop(space_data, "show_mask_smooth", text="Smooth") - row.prop(space_data, "mask_draw_type", text="") + row.prop(space_data, "mask_display_type", text="") row = layout.row(align=True) row.prop(space_data, "show_mask_overlay", text="Overlay") sub = row.row() diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 8d4112ad456..4f95f1fbf05 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -229,7 +229,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): obj_type = obj.type is_geometry = (obj_type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT'}) is_wire = (obj_type in {'CAMERA', 'EMPTY'}) - is_empty_image = (obj_type == 'EMPTY' and obj.empty_draw_type == 'IMAGE') + is_empty_image = (obj_type == 'EMPTY' and obj.empty_display_type == 'IMAGE') is_dupli = (obj.dupli_type != 'NONE') col = flow.column() @@ -254,7 +254,7 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): col.prop(obj.display, "show_shadows", text="Shadow") col = flow.column() - col.prop(obj, "show_x_ray", text="In Front") + col.prop(obj, "show_in_front", text="In Front") # if obj_type == 'MESH' or is_empty_image: # col.prop(obj, "show_transparent", text="Transparency") @@ -262,15 +262,15 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): col = flow.column() if is_wire: - # wire objects only use the max. draw type for duplis + # wire objects only use the max. display type for duplis col.active = is_dupli - col.prop(obj, "draw_type", text="Display As") + col.prop(obj, "display_type", text="Display As") split = flow.split(factor=0.6) split.prop(obj, "show_bounds", text="Bounds") row = split.row() - row.active = obj.show_bounds or (obj.draw_type == 'BOUNDS') - row.prop(obj, "draw_bounds_type", text="") + row.active = obj.show_bounds or (obj.display_type == 'BOUNDS') + row.prop(obj, "display_bounds_type", text="") if is_geometry or is_empty_image: # Only useful with object having faces/materials... diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index ff8aeb3106b..da8034761f6 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1614,29 +1614,29 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, Panel): psys = context.particle_system part = particle_get_settings(context) - layout.prop(part, "draw_method", text="Display As") + layout.prop(part, "display_method", text="Display As") - if part.draw_method == 'NONE' or (part.render_type == 'NONE' and part.draw_method == 'RENDER'): + if part.display_method == 'NONE' or (part.render_type == 'NONE' and part.display_method == 'RENDER'): return - path = (part.render_type == 'PATH' and part.draw_method == 'RENDER') or part.draw_method == 'PATH' + path = (part.render_type == 'PATH' and part.display_method == 'RENDER') or part.display_method == 'PATH' layout.separator() col = layout.column() - col.prop(part, "draw_color", text="Color") - if part.draw_color in {'VELOCITY', 'ACCELERATION'}: + col.prop(part, "display_color", text="Color") + if part.display_color in {'VELOCITY', 'ACCELERATION'}: col.prop(part, "color_maximum", text="Fade Distance") col = layout.column() if path: - col.prop(part, "draw_step", text="Strand Steps") - col.prop(part, "draw_percentage", slider=True, text="Amount") - if part.draw_method != 'RENDER' or part.render_type == 'HALO': - col.prop(part, "draw_size", text="Size") + col.prop(part, "display_step", text="Strand Steps") + col.prop(part, "display_percentage", slider=True, text="Amount") + if part.display_method != 'RENDER' or part.render_type == 'HALO': + col.prop(part, "display_size", text="Size") - if part.draw_percentage != 100 and psys is not None: + if part.display_percentage != 100 and psys is not None: if part.type == 'HAIR': if psys.use_hair_dynamics and psys.point_cache.is_baked is False: layout.row().label(text="Display percentage makes dynamics inaccurate without baking") diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 7c9e843fcad..9896d3afc52 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -643,7 +643,7 @@ class PHYSICS_PT_smoke_viewport_display_debug(PhysicButtonsPanel, Panel): def draw_header(self, context): md = context.smoke.domain_settings - self.layout.prop(md, "draw_velocity", text="") + self.layout.prop(md, "display_velocity", text="") def draw(self, context): layout = self.layout @@ -653,8 +653,8 @@ class PHYSICS_PT_smoke_viewport_display_debug(PhysicButtonsPanel, Panel): domain = context.smoke.domain_settings col = flow.column() - col.enabled = domain.draw_velocity - col.prop(domain, "vector_draw_type", text="Display As") + col.enabled = domain.display_velocity + col.prop(domain, "vector_display_type", text="Display As") col.prop(domain, "vector_scale") diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 38b73b0397a..b1ca853a1e8 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -814,7 +814,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): row.label(text="Cubemap Display") sub = row.row(align=True) - sub.prop(props, "gi_cubemap_draw_size", text="Size") + sub.prop(props, "gi_cubemap_display_size", text="Size") if props.gi_show_cubemaps: sub.prop(props, "gi_show_cubemaps", text="", toggle=True, icon='HIDE_OFF') else: @@ -825,7 +825,7 @@ class RENDER_PT_eevee_indirect_lighting(RenderButtonsPanel, Panel): row.label(text="Irradiance Display") sub = row.row(align=True) - sub.prop(props, "gi_irradiance_draw_size", text="Size") + sub.prop(props, "gi_irradiance_display_size", text="Size") if props.gi_show_irradiance: sub.prop(props, "gi_show_irradiance", text="", toggle=True, icon='HIDE_OFF') else: diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 95c7072f14a..6c295db8bfa 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -578,7 +578,7 @@ class IMAGE_HT_header(Header): # draw options. row = layout.row() - row.prop(sima, "draw_channels", icon_only=True) + row.prop(sima, "display_channels", icon_only=True) row = layout.row(align=True) if ima.type == 'COMPOSITE': @@ -755,7 +755,7 @@ class IMAGE_PT_view_display_uv_edit_overlays(Panel): col = layout.column() - col.prop(uvedit, "edge_draw_type", text="Edges") + col.prop(uvedit, "edge_display_type", text="Edges") col.prop(uvedit, "show_faces", text="Faces") col = layout.column() @@ -796,7 +796,7 @@ class IMAGE_PT_view_display_uv_edit_overlays_advanced(Panel): sub = col.column() sub.active = uvedit.show_stretch - sub.prop(uvedit, "draw_stretch_type", text="Type") + sub.prop(uvedit, "display_stretch_type", text="Type") class IMAGE_UL_render_slots(UIList): diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index f5f0edc7311..a5227a28889 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -224,7 +224,7 @@ class SEQUENCER_MT_view(Menu): layout.prop(st, "show_frame_indicator") layout.prop(st, "show_strip_offset") - layout.prop_menu_enum(st, "waveform_draw_type") + layout.prop_menu_enum(st, "waveform_display_type") if is_preview: if st.display_mode == 'IMAGE': @@ -912,7 +912,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel, Panel): layout.prop(sound, "use_mono") - if st.waveform_draw_type == 'DEFAULT_WAVEFORMS': + if st.waveform_display_type == 'DEFAULT_WAVEFORMS': layout.prop(strip, "show_waveform") col = layout.column(align=True) @@ -1160,7 +1160,7 @@ class SEQUENCER_PT_view(SequencerButtonsPanel_Output, Panel): col = layout.column() if st.display_mode == 'IMAGE': - col.prop(st, "draw_overexposed") + col.prop(st, "show_overexposed") col.separator() elif st.display_mode == 'WAVEFORM': diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 246d2c68aab..8a253d028d9 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -423,11 +423,11 @@ class VIEW3D_MT_transform_armature(VIEW3D_MT_transform_base): # armature specific extensions follow... obj = context.object if obj.type == 'ARMATURE' and obj.mode in {'EDIT', 'POSE'}: - if obj.data.draw_type == 'BBONE': + if obj.data.display_type == 'BBONE': layout.separator() layout.operator("transform.transform", text="Scale BBone").mode = 'BONE_SIZE' - elif obj.data.draw_type == 'ENVELOPE': + elif obj.data.display_type == 'ENVELOPE': layout.separator() layout.operator("transform.transform", text="Scale Envelope Distance").mode = 'BONE_SIZE' @@ -1761,7 +1761,7 @@ class VIEW3D_MT_object_specials(Menu): props = layout.operator("wm.context_modal_mouse", text="Empty Draw Size") props.data_path_iter = "selected_editable_objects" - props.data_path_item = "empty_draw_size" + props.data_path_item = "empty_display_size" props.input_scale = 0.01 props.header_text = "Empty Draw Size: %.3f" @@ -4330,8 +4330,8 @@ class VIEW3D_PT_overlay_motion_tracking(Panel): col = layout.column() col.label(text="Tracks:") row = col.row(align=True) - row.prop(view, "tracks_draw_type", text="") - row.prop(view, "tracks_draw_size", text="Size") + row.prop(view, "tracks_display_type", text="") + row.prop(view, "tracks_display_size", text="Size") class VIEW3D_PT_overlay_edit_mesh(Panel): diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 513c3293ed1..4fe4ce4375d 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1345,8 +1345,8 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, Panel): col = layout.column(align=True) col.active = pe.is_editable - col.label(text="Draw:") - col.prop(pe, "draw_step", text="Path Steps") + col.label(text="Display:") + col.prop(pe, "display_step", text="Path Steps") if pe.is_hair: col.prop(pe, "show_particles", text="Children") else: diff --git a/release/scripts/templates_py/builtin_keyingset.py b/release/scripts/templates_py/builtin_keyingset.py index 19f92dc75e7..cafbc2df542 100644 --- a/release/scripts/templates_py/builtin_keyingset.py +++ b/release/scripts/templates_py/builtin_keyingset.py @@ -22,7 +22,7 @@ class BUILTIN_KSI_hello(bpy.types.KeyingSetInfo): for i in range(5): ks.paths.add(id_block, "layers", i, group_method='NAMED', group_name="5x Hello Layers") - ks.paths.add(id_block, "show_x_ray", group_method='NONE') + ks.paths.add(id_block, "show_in_front", group_method='NONE') def register(): diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c index 87b11f5d7a3..0878bef98f2 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c @@ -246,7 +246,7 @@ static void WIDGETGROUP_camera_message_subscribe( { extern PropertyRNA rna_Camera_dof_distance; - extern PropertyRNA rna_Camera_draw_size; + extern PropertyRNA rna_Camera_display_size; extern PropertyRNA rna_Camera_ortho_scale; extern PropertyRNA rna_Camera_sensor_fit; extern PropertyRNA rna_Camera_sensor_width; @@ -256,7 +256,7 @@ static void WIDGETGROUP_camera_message_subscribe( extern PropertyRNA rna_Camera_lens; const PropertyRNA *props[] = { &rna_Camera_dof_distance, - &rna_Camera_draw_size, + &rna_Camera_display_size, &rna_Camera_ortho_scale, &rna_Camera_sensor_fit, &rna_Camera_sensor_width, diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index a44ccffdd05..bd2deba9685 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -677,7 +677,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) prop = RNA_def_property(srna, "show_wire", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_DRAWWIRE); - RNA_def_property_ui_text(prop, "Draw Wire", + RNA_def_property_ui_text(prop, "Display Wire", "Bone is always drawn as Wireframe regardless of viewport draw mode " "(useful for non-obstructive custom bone shapes)"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); @@ -1077,10 +1077,10 @@ static void rna_def_armature(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Armature_update_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); - prop = RNA_def_property(srna, "draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "drawtype"); RNA_def_property_enum_items(prop, prop_drawtype_items); - RNA_def_property_ui_text(prop, "Draw Type", ""); + RNA_def_property_ui_text(prop, "Display Type Type", ""); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); @@ -1115,13 +1115,13 @@ static void rna_def_armature(BlenderRNA *brna) /* flag */ prop = RNA_def_property(srna, "show_axes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ARM_DRAWAXES); - RNA_def_property_ui_text(prop, "Draw Axes", "Draw bone axes"); + RNA_def_property_ui_text(prop, "Display Axes", "Display bone axes"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); prop = RNA_def_property(srna, "show_names", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ARM_DRAWNAMES); - RNA_def_property_ui_text(prop, "Draw Names", "Draw bone names"); + RNA_def_property_ui_text(prop, "Display Names", "Display bone names"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); @@ -1144,18 +1144,18 @@ static void rna_def_armature(BlenderRNA *brna) prop = RNA_def_property(srna, "show_bone_custom_shapes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", ARM_NO_CUSTOM); - RNA_def_property_ui_text(prop, "Draw Custom Bone Shapes", "Draw bones with their custom shapes"); + RNA_def_property_ui_text(prop, "Display Custom Bone Shapes", "Display bones with their custom shapes"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); prop = RNA_def_property(srna, "show_group_colors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ARM_COL_CUSTOM); - RNA_def_property_ui_text(prop, "Draw Bone Group Colors", "Draw bone group colors"); + RNA_def_property_ui_text(prop, "Display Bone Group Colors", "Display bone group colors"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); /* XXX deprecated ....... old animviz for armatures only */ prop = RNA_def_property(srna, "show_only_ghost_selected", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ARM_GHOST_ONLYSEL); - RNA_def_property_ui_text(prop, "Draw Ghosts on Selected Bones Only", ""); + RNA_def_property_ui_text(prop, "Display Ghosts on Selected Bones Only", ""); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); /* XXX deprecated ....... old animviz for armatures only */ diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c index 8ca45e6dd2d..60c68bc7214 100644 --- a/source/blender/makesrna/intern/rna_camera.c +++ b/source/blender/makesrna/intern/rna_camera.c @@ -156,7 +156,7 @@ static void rna_def_camera_background_image(BlenderRNA *brna) {0, NULL, 0, NULL, NULL} }; - static const EnumPropertyItem bgpic_draw_depth_items[] = { + static const EnumPropertyItem bgpic_display_depth_items[] = { {0, "BACK", 0, "Back", ""}, {CAM_BGIMG_FLAG_FOREGROUND, "FRONT", 0, "Front", ""}, {0, NULL, 0, NULL, NULL} @@ -251,10 +251,10 @@ static void rna_def_camera_background_image(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); /* expose 1 flag as a enum of 2 items */ - prop = RNA_def_property(srna, "draw_depth", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_depth", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); - RNA_def_property_enum_items(prop, bgpic_draw_depth_items); - RNA_def_property_ui_text(prop, "Depth", "Draw under or over everything"); + RNA_def_property_enum_items(prop, bgpic_display_depth_items); + RNA_def_property_ui_text(prop, "Depth", "Display under or over everything"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); /* expose 2 flags as a enum of 3 items */ @@ -378,7 +378,7 @@ void RNA_def_camera(BlenderRNA *brna) {CAM_PANO, "PANO", 0, "Panoramic", ""}, {0, NULL, 0, NULL, NULL} }; - static const EnumPropertyItem prop_draw_type_extra_items[] = { + static const EnumPropertyItem prop_display_type_extra_items[] = { {CAM_DTX_CENTER, "CENTER", 0, "Center", ""}, {CAM_DTX_CENTER_DIAG, "CENTER_DIAGONAL", 0, "Center Diagonal", ""}, {CAM_DTX_THIRDS, "THIRDS", 0, "Thirds", ""}, @@ -413,9 +413,9 @@ void RNA_def_camera(BlenderRNA *brna) prop = RNA_def_property(srna, "show_guide", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dtx"); - RNA_def_property_enum_items(prop, prop_draw_type_extra_items); + RNA_def_property_enum_items(prop, prop_display_type_extra_items); RNA_def_property_flag(prop, PROP_ENUM_FLAG); - RNA_def_property_ui_text(prop, "Composition Guides", "Draw overlay"); + RNA_def_property_ui_text(prop, "Composition Guides", "Display overlay"); RNA_def_property_update(prop, NC_CAMERA | ND_DRAW_RENDER_VIEWPORT, NULL); prop = RNA_def_property(srna, "sensor_fit", PROP_ENUM, PROP_NONE); @@ -501,12 +501,12 @@ void RNA_def_camera(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Orthographic Scale", "Orthographic Camera scale (similar to zoom)"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Camera_update"); - prop = RNA_def_property(srna, "draw_size", PROP_FLOAT, PROP_DISTANCE); + prop = RNA_def_property(srna, "display_size", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "drawsize"); RNA_def_property_float_default(prop, 1.0f); RNA_def_property_range(prop, 0.01f, 1000.0f); RNA_def_property_ui_range(prop, 0.01, 100, 1, 2); - RNA_def_property_ui_text(prop, "Draw Size", "Apparent size of the Camera object in the 3D View"); + RNA_def_property_ui_text(prop, "Display Size", "Apparent size of the Camera object in the 3D View"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "shift_x", PROP_FLOAT, PROP_NONE); @@ -540,12 +540,12 @@ void RNA_def_camera(BlenderRNA *brna) /* flag */ prop = RNA_def_property(srna, "show_limits", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CAM_SHOWLIMITS); - RNA_def_property_ui_text(prop, "Show Limits", "Draw the clipping range and focus point on the camera"); + RNA_def_property_ui_text(prop, "Show Limits", "Display the clipping range and focus point on the camera"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_mist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CAM_SHOWMIST); - RNA_def_property_ui_text(prop, "Show Mist", "Draw a line from the Camera to indicate the mist area"); + RNA_def_property_ui_text(prop, "Show Mist", "Display a line from the Camera to indicate the mist area"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_passepartout", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 85bc30665c1..e0314fff8d5 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -816,7 +816,7 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna) StructRNA *srna; PropertyRNA *prop; - static const EnumPropertyItem stroke_draw_mode_items[] = { + static const EnumPropertyItem stroke_display_mode_items[] = { {0, "SCREEN", 0, "Screen", "Stroke is in screen-space"}, {GP_STROKE_3DSPACE, "3DSPACE", 0, "3D Space", "Stroke is in 3D-space"}, {GP_STROKE_2DSPACE, "2DSPACE", 0, "2D Space", "Stroke is in 2D-space"}, @@ -855,9 +855,9 @@ static void rna_def_gpencil_stroke(BlenderRNA *brna) RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); /* Settings */ - prop = RNA_def_property(srna, "draw_mode", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); - RNA_def_property_enum_items(prop, stroke_draw_mode_items); + RNA_def_property_enum_items(prop, stroke_display_mode_items); RNA_def_property_ui_text(prop, "Draw Mode", "Coordinate space that stroke is in"); RNA_def_property_update(prop, 0, "rna_GPencil_update"); @@ -1125,10 +1125,10 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Points", "Draw the points which make up the strokes (for debugging purposes)"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); - /* X-Ray */ - prop = RNA_def_property(srna, "show_x_ray", PROP_BOOLEAN, PROP_NONE); + /* In Front */ + prop = RNA_def_property(srna, "show_in_front", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GP_LAYER_NO_XRAY); - RNA_def_property_ui_text(prop, "X Ray", "Make the layer draw in front of objects"); + RNA_def_property_ui_text(prop, "In Front", "Make the layer draw in front of objects"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); /* Parent object */ diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 086c914c6ae..bc8c914de94 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -498,7 +498,7 @@ static const EnumPropertyItem *rna_Object_parent_type_itemf(bContext *UNUSED(C), return item; } -static void rna_Object_empty_draw_type_set(PointerRNA *ptr, int value) +static void rna_Object_empty_display_type_set(PointerRNA *ptr, int value) { Object *ob = (Object *)ptr->data; @@ -2090,20 +2090,20 @@ static void rna_def_object(BlenderRNA *brna) }; static const EnumPropertyItem drawtype_items[] = { - {OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Draw the bounds of the object"}, - {OB_WIRE, "WIRE", 0, "Wire", "Draw the object as a wireframe"}, - {OB_SOLID, "SOLID", 0, "Solid", "Draw the object as a solid (if solid drawing is enabled in the viewport)"}, + {OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Display the bounds of the object"}, + {OB_WIRE, "WIRE", 0, "Wire", "Display the object as a wireframe"}, + {OB_SOLID, "SOLID", 0, "Solid", "Display the object as a solid (if solid drawing is enabled in the viewport)"}, {OB_TEXTURE, "TEXTURED", 0, "Textured", - "Draw the object with textures (if textures are enabled in the viewport)"}, + "Display the object with textures (if textures are enabled in the viewport)"}, {0, NULL, 0, NULL, NULL} }; static const EnumPropertyItem boundtype_items[] = { - {OB_BOUND_BOX, "BOX", 0, "Box", "Draw bounds as box"}, - {OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", "Draw bounds as sphere"}, - {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", "Draw bounds as cylinder"}, - {OB_BOUND_CONE, "CONE", 0, "Cone", "Draw bounds as cone"}, - {OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", "Draw bounds as capsule"}, + {OB_BOUND_BOX, "BOX", 0, "Box", "Display bounds as box"}, + {OB_BOUND_SPHERE, "SPHERE", 0, "Sphere", "Display bounds as sphere"}, + {OB_BOUND_CYLINDER, "CYLINDER", 0, "Cylinder", "Display bounds as cylinder"}, + {OB_BOUND_CONE, "CONE", 0, "Cone", "Display bounds as cone"}, + {OB_BOUND_CAPSULE, "CAPSULE", 0, "Capsule", "Display bounds as capsule"}, {0, NULL, 0, NULL, NULL} }; @@ -2461,14 +2461,14 @@ static void rna_def_object(BlenderRNA *brna) rna_def_object_face_maps(brna, prop); /* empty */ - prop = RNA_def_property(srna, "empty_draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "empty_display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "empty_drawtype"); RNA_def_property_enum_items(prop, rna_enum_object_empty_drawtype_items); - RNA_def_property_enum_funcs(prop, NULL, "rna_Object_empty_draw_type_set", NULL); + RNA_def_property_enum_funcs(prop, NULL, "rna_Object_empty_display_type_set", NULL); RNA_def_property_ui_text(prop, "Empty Display Type", "Viewport display style for empties"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); - prop = RNA_def_property(srna, "empty_draw_size", PROP_FLOAT, PROP_DISTANCE); + prop = RNA_def_property(srna, "empty_display_size", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "empty_drawsize"); RNA_def_property_range(prop, 0.0001f, 1000.0f); RNA_def_property_ui_range(prop, 0.01, 100, 1, 2); @@ -2655,58 +2655,58 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* drawing */ - prop = RNA_def_property(srna, "draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dt"); RNA_def_property_enum_items(prop, drawtype_items); - RNA_def_property_ui_text(prop, "Maximum Draw Type", "Maximum draw type to display object with in viewport"); + RNA_def_property_ui_text(prop, "Display As", "How to display object in viewport"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Object_internal_update"); prop = RNA_def_property(srna, "show_bounds", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWBOUNDOX); - RNA_def_property_ui_text(prop, "Draw Bounds", "Display the object's bounds"); + RNA_def_property_ui_text(prop, "Display Bounds", "Display the object's bounds"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); - prop = RNA_def_property(srna, "draw_bounds_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_bounds_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "boundtype"); RNA_def_property_enum_items(prop, boundtype_items); - RNA_def_property_ui_text(prop, "Draw Bounds Type", "Object boundary display type"); + RNA_def_property_ui_text(prop, "Display Bounds Type", "Object boundary display type"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_name", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWNAME); - RNA_def_property_ui_text(prop, "Draw Name", "Display the object's name"); + RNA_def_property_ui_text(prop, "Display Name", "Display the object's name"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_axis", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_AXIS); - RNA_def_property_ui_text(prop, "Draw Axes", "Display the object's origin and axes"); + RNA_def_property_ui_text(prop, "Display Axes", "Display the object's origin and axes"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_texture_space", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_TEXSPACE); - RNA_def_property_ui_text(prop, "Draw Texture Space", "Display the object's texture space"); + RNA_def_property_ui_text(prop, "Display Texture Space", "Display the object's texture space"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_wire", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWWIRE); - RNA_def_property_ui_text(prop, "Draw Wire", "Add the object's wireframe over solid drawing"); + RNA_def_property_ui_text(prop, "Display Wire", "Add the object's wireframe over solid drawing"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_all_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAW_ALL_EDGES); - RNA_def_property_ui_text(prop, "Draw All Edges", "Display all edges for mesh objects"); + RNA_def_property_ui_text(prop, "Display All Edges", "Display all edges for mesh objects"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "show_transparent", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWTRANSP); - RNA_def_property_ui_text(prop, "Draw Transparent", - "Display material transparency in the object (unsupported for duplicator drawing)"); + RNA_def_property_ui_text(prop, "Display Transparent", + "Display material transparency in the object"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); - prop = RNA_def_property(srna, "show_x_ray", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "show_in_front", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "dtx", OB_DRAWXRAY); - RNA_def_property_ui_text(prop, "X-Ray", - "Make the object draw in front of others (unsupported for duplicator drawing)"); + RNA_def_property_ui_text(prop, "In Front", + "Make the object draw in front of others"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); /* Grease Pencil */ diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 96640922032..a35c03eaf89 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -2371,7 +2371,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Strand Render", "Use the strand primitive for rendering"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop = RNA_def_property(srna, "draw_method", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "draw_as"); RNA_def_property_enum_items(prop, part_draw_as_items); RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_Particle_draw_as_itemf"); @@ -2385,13 +2385,14 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Particle Rendering", "How particles are rendered"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop = RNA_def_property(srna, "draw_color", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_color", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "draw_col"); RNA_def_property_enum_items(prop, draw_col_items); RNA_def_property_ui_text(prop, "Draw Color", "Draw additional particle data as a color"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop = RNA_def_property(srna, "draw_size", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "display_size", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "draw_size"); RNA_def_property_range(prop, 0, 1000); RNA_def_property_ui_range(prop, 0, 100, 1, -1); RNA_def_property_ui_text(prop, "Draw Size", "Size of particles on viewport in BU"); @@ -2403,7 +2404,8 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Children From", "Create child particles"); RNA_def_property_update(prop, 0, "rna_Particle_redo_child"); - prop = RNA_def_property(srna, "draw_step", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "display_step", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "draw_step"); RNA_def_property_range(prop, 0, 10); RNA_def_property_ui_range(prop, 0, 7, 1, -1); RNA_def_property_ui_text(prop, "Steps", "How many steps paths are drawn with (power of 2)"); @@ -2443,7 +2445,7 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_range(prop, 0, 50); RNA_def_property_ui_text(prop, "Pixel", "How many pixels path has to cover to make another render segment"); - prop = RNA_def_property(srna, "draw_percentage", PROP_INT, PROP_PERCENTAGE); + prop = RNA_def_property(srna, "display_percentage", PROP_INT, PROP_PERCENTAGE); RNA_def_property_int_sdna(prop, NULL, "disp"); RNA_def_property_range(prop, 0, 100); RNA_def_property_ui_text(prop, "Display", "Percentage of particles to display in 3D view"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 33fd40e5c9b..e451c87aa3a 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2537,7 +2537,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "show_uv_local_view", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uv_flag", UV_SHOW_SAME_IMAGE); - RNA_def_property_ui_text(prop, "UV Local View", "Draw only faces with the currently displayed image assigned"); + RNA_def_property_ui_text(prop, "UV Local View", "Display only faces with the currently displayed image assigned"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); /* Mesh */ @@ -2775,9 +2775,9 @@ static void rna_def_curve_paint_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Depth", "Method of projecting depth"); static const EnumPropertyItem surface_plane_items[] = { - {CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW, "NORMAL_VIEW", 0, "Normal/View", "Draw perpendicular to the surface"}, - {CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE, "NORMAL_SURFACE", 0, "Normal/Surface", "Draw aligned to the surface"}, - {CURVE_PAINT_SURFACE_PLANE_VIEW, "VIEW", 0, "View", "Draw aligned to the viewport"}, + {CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW, "NORMAL_VIEW", 0, "Normal/View", "Display perpendicular to the surface"}, + {CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE, "NORMAL_SURFACE", 0, "Normal/Surface", "Display aligned to the surface"}, + {CURVE_PAINT_SURFACE_PLANE_VIEW, "VIEW", 0, "View", "Display aligned to the viewport"}, {0, NULL, 0, NULL, NULL}}; prop = RNA_def_property(srna, "surface_plane", PROP_ENUM, PROP_NONE); @@ -5057,7 +5057,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop = RNA_def_property(srna, "use_stamp_labels", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "stamp", R_STAMP_HIDE_LABELS); - RNA_def_property_ui_text(prop, "Stamp Labels", "Draw stamp labels (\"Camera\" in front of camera name, etc.)"); + RNA_def_property_ui_text(prop, "Stamp Labels", "Display stamp labels (\"Camera\" in front of camera name, etc.)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_stamp_strip_meta", PROP_BOOLEAN, PROP_NONE); @@ -5114,7 +5114,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) prop = RNA_def_property(srna, "use_sequencer_gl_textured_solid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "seq_flag", R_SEQ_SOLID_TEX); - RNA_def_property_ui_text(prop, "Textured Solid", "Draw face-assigned textures in solid draw method"); + RNA_def_property_ui_text(prop, "Textured Solid", "Display face-assigned textures in solid draw method"); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_SceneSequencer_update"); prop = RNA_def_property(srna, "use_sequencer_gl_dof", PROP_BOOLEAN, PROP_NONE); @@ -5581,15 +5581,17 @@ static void rna_def_scene_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Cubemap Cache", "Display captured cubemaps in the viewport"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC); - prop = RNA_def_property(srna, "gi_irradiance_draw_size", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "gi_irradiance_display_size", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "gi_irradiance_draw_size"); RNA_def_property_range(prop, 0.05f, 10.0f); RNA_def_property_float_default(prop, 0.1f); - RNA_def_property_ui_text(prop, "Irradiance Draw Size", "Size of the irradiance sample spheres to debug captured light"); + RNA_def_property_ui_text(prop, "Irradiance Display Size", "Size of the irradiance sample spheres to debug captured light"); - prop = RNA_def_property(srna, "gi_cubemap_draw_size", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "gi_cubemap_display_size", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "gi_cubemap_draw_size"); RNA_def_property_range(prop, 0.05f, 10.0f); RNA_def_property_float_default(prop, 0.3f); - RNA_def_property_ui_text(prop, "Cubemap Draw Size", "Size of the cubemap spheres to debug captured light"); + RNA_def_property_ui_text(prop, "Cubemap Display Size", "Size of the cubemap spheres to debug captured light"); prop = RNA_def_property(srna, "gi_auto_bake", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_GI_AUTOBAKE); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 8f09f1dac67..8ae069917f1 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -1011,10 +1011,11 @@ static void rna_def_particle_edit(BlenderRNA *brna) RNA_def_property_pointer_funcs(prop, "rna_ParticleEdit_brush_get", NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Brush", ""); - prop = RNA_def_property(srna, "draw_step", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "display_step", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "draw_step"); RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_range(prop, 1, 10); - RNA_def_property_ui_text(prop, "Steps", "How many steps to draw the path with"); + RNA_def_property_ui_text(prop, "Steps", "How many steps to display the path with"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_ParticleEdit_redo"); prop = RNA_def_property(srna, "fade_frames", PROP_INT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 9af5dabbb67..5eb25985fa4 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -523,8 +523,8 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) }; static const EnumPropertyItem vector_draw_items[] = { - {VECTOR_DRAW_NEEDLE, "NEEDLE", 0, "Needle", "Draw vectors as needles"}, - {VECTOR_DRAW_STREAMLINE, "STREAMLINE", 0, "Streamlines", "Draw vectors as streamlines"}, + {VECTOR_DRAW_NEEDLE, "NEEDLE", 0, "Needle", "Display vectors as needles"}, + {VECTOR_DRAW_STREAMLINE, "STREAMLINE", 0, "Streamlines", "Display vectors as streamlines"}, {0, NULL, 0, NULL, NULL} }; @@ -856,15 +856,15 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Thickness", "Thickness of smoke drawing in the viewport"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, NULL); - prop = RNA_def_property(srna, "draw_velocity", PROP_BOOLEAN, PROP_NONE); + prop = RNA_def_property(srna, "display_velocity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "draw_velocity", 0); - RNA_def_property_ui_text(prop, "Draw Velocity", "Toggle visualization of the velocity field as needles"); + RNA_def_property_ui_text(prop, "Display Velocity", "Toggle visualization of the velocity field as needles"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); - prop = RNA_def_property(srna, "vector_draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "vector_display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "vector_draw_type"); RNA_def_property_enum_items(prop, vector_draw_items); - RNA_def_property_ui_text(prop, "Draw Type", ""); + RNA_def_property_ui_text(prop, "Display Type", ""); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); prop = RNA_def_property(srna, "vector_scale", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 9629b4a877b..04cb01cabee 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -209,13 +209,13 @@ static const EnumPropertyItem stereo3d_eye_items[] = { }; #endif -static const EnumPropertyItem draw_channels_items[] = { +static const EnumPropertyItem display_channels_items[] = { {SI_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha", - "Draw image with RGB colors and alpha transparency"}, - {0, "COLOR", ICON_IMAGE_RGB, "Color", "Draw image with RGB colors"}, - {SI_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Draw alpha transparency channel"}, + "Display image with RGB colors and alpha transparency"}, + {0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"}, + {SI_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Display alpha transparency channel"}, {SI_SHOW_ZBUF, "Z_BUFFER", ICON_IMAGE_ZDEPTH, "Z-Buffer", - "Draw Z-buffer associated with image (mapped from camera clip start to end)"}, + "Display Z-buffer associated with image (mapped from camera clip start to end)"}, {SI_SHOW_R, "RED", ICON_COLOR_RED, "Red", ""}, {SI_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""}, {SI_SHOW_B, "BLUE", ICON_COLOR_BLUE, "Blue", ""}, @@ -1064,7 +1064,7 @@ static void rna_SpaceImageEditor_mask_set(PointerRNA *ptr, PointerRNA value) ED_space_image_set_mask(NULL, sima, (Mask *)value.data); } -static const EnumPropertyItem *rna_SpaceImageEditor_draw_channels_itemf( +static const EnumPropertyItem *rna_SpaceImageEditor_display_channels_itemf( bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free) { @@ -1082,24 +1082,24 @@ static const EnumPropertyItem *rna_SpaceImageEditor_draw_channels_itemf( ED_space_image_release_buffer(sima, ibuf, lock); if (alpha && zbuf) - return draw_channels_items; + return display_channels_items; if (alpha) { - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, SI_USE_ALPHA); - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, 0); - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, SI_SHOW_ALPHA); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, SI_USE_ALPHA); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, 0); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, SI_SHOW_ALPHA); } else if (zbuf) { - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, 0); - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, SI_SHOW_ZBUF); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, 0); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, SI_SHOW_ZBUF); } else { - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, 0); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, 0); } - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, SI_SHOW_R); - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, SI_SHOW_G); - RNA_enum_items_add_value(&item, &totitem, draw_channels_items, SI_SHOW_B); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, SI_SHOW_R); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, SI_SHOW_G); + RNA_enum_items_add_value(&item, &totitem, display_channels_items, SI_SHOW_B); RNA_enum_item_end(&item, &totitem); *r_free = true; @@ -2097,10 +2097,10 @@ static void rna_FileBrowser_FSMenuRecent_active_range(PointerRNA *ptr, int *min, #else static const EnumPropertyItem dt_uv_items[] = { - {SI_UVDT_OUTLINE, "OUTLINE", 0, "Outline", "Draw white edges with black outline"}, - {SI_UVDT_DASH, "DASH", 0, "Dash", "Draw dashed black-white edges"}, - {SI_UVDT_BLACK, "BLACK", 0, "Black", "Draw black edges"}, - {SI_UVDT_WHITE, "WHITE", 0, "White", "Draw white edges"}, + {SI_UVDT_OUTLINE, "OUTLINE", 0, "Outline", "Display white edges with black outline"}, + {SI_UVDT_DASH, "DASH", 0, "Dash", "Display dashed black-white edges"}, + {SI_UVDT_BLACK, "BLACK", 0, "Black", "Display black edges"}, + {SI_UVDT_WHITE, "WHITE", 0, "White", "Display white edges"}, {0, NULL, 0, NULL, NULL} }; @@ -2147,15 +2147,15 @@ static void rna_def_space_mask_info(StructRNA *srna, int noteflag, const char *m RNA_def_property_update(prop, noteflag, NULL); /* mask drawing */ - prop = RNA_def_property(srna, "mask_draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "mask_display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "mask_info.draw_type"); RNA_def_property_enum_items(prop, dt_uv_items); - RNA_def_property_ui_text(prop, "Edge Draw Type", "Draw type for mask splines"); + RNA_def_property_ui_text(prop, "Edge Display Type", "Display type for mask splines"); RNA_def_property_update(prop, noteflag, NULL); prop = RNA_def_property(srna, "show_mask_smooth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mask_info.draw_flag", MASK_DRAWFLAG_SMOOTH); - RNA_def_property_ui_text(prop, "Draw Smooth Splines", ""); + RNA_def_property_ui_text(prop, "Display Smooth Splines", ""); RNA_def_property_update(prop, noteflag, NULL); prop = RNA_def_property(srna, "show_mask_overlay", PROP_BOOLEAN, PROP_NONE); @@ -2211,48 +2211,48 @@ static void rna_def_space_image_uv(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); /* drawing */ - prop = RNA_def_property(srna, "edge_draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "edge_display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dt_uv"); RNA_def_property_enum_items(prop, dt_uv_items); - RNA_def_property_ui_text(prop, "Edge Draw Type", "Draw type for drawing UV edges"); + RNA_def_property_ui_text(prop, "Edge Display Type", "Display type for drawing UV edges"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_smooth_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_SMOOTH_UV); - RNA_def_property_ui_text(prop, "Draw Smooth Edges", "Draw UV edges anti-aliased"); + RNA_def_property_ui_text(prop, "Display Smooth Edges", "Display UV edges anti-aliased"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_stretch", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_STRETCH); - RNA_def_property_ui_text(prop, "Draw Stretch", - "Draw faces colored according to the difference in shape between UVs and " + RNA_def_property_ui_text(prop, "Display Stretch", + "Display faces colored according to the difference in shape between UVs and " "their 3D coordinates (blue for low distortion, red for high distortion)"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); - prop = RNA_def_property(srna, "draw_stretch_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_stretch_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dt_uvstretch"); RNA_def_property_enum_items(prop, dt_uvstretch_items); - RNA_def_property_ui_text(prop, "Draw Stretch Type", "Type of stretch to draw"); + RNA_def_property_ui_text(prop, "Display Stretch Type", "Type of stretch to draw"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_modified_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAWSHADOW); - RNA_def_property_ui_text(prop, "Draw Modified Edges", "Draw edges after modifiers are applied"); + RNA_def_property_ui_text(prop, "Display Modified Edges", "Display edges after modifiers are applied"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_other_objects", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_OTHER); - RNA_def_property_ui_text(prop, "Draw Other Objects", "Draw other selected objects that share the same image"); + RNA_def_property_ui_text(prop, "Display Other Objects", "Display other selected objects that share the same image"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_metadata", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_METADATA); - RNA_def_property_ui_text(prop, "Show Metadata", "Draw metadata properties of the image"); + RNA_def_property_ui_text(prop, "Show Metadata", "Display metadata properties of the image"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_texpaint", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SI_NO_DRAW_TEXPAINT); - RNA_def_property_ui_text(prop, "Draw Texture Paint UVs", "Draw overlay of texture paint uv layer"); + RNA_def_property_ui_text(prop, "Display Texture Paint UVs", "Display overlay of texture paint uv layer"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_pixel_coords", PROP_BOOLEAN, PROP_NONE); @@ -2263,7 +2263,7 @@ static void rna_def_space_image_uv(BlenderRNA *brna) prop = RNA_def_property(srna, "show_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SI_NO_DRAWFACES); - RNA_def_property_ui_text(prop, "Draw Faces", "Draw faces over the image"); + RNA_def_property_ui_text(prop, "Display Faces", "Display faces over the image"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); /* todo: move edge and face drawing options here from G.f */ @@ -2780,22 +2780,22 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) prop = RNA_def_property(srna, "show_weight", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_WEIGHT); - RNA_def_property_ui_text(prop, "Show Weights", "Draw weights in editmode"); + RNA_def_property_ui_text(prop, "Show Weights", "Display weights in editmode"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_face_normals", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_FACE_NORMALS); - RNA_def_property_ui_text(prop, "Draw Normals", "Display face normals as lines"); + RNA_def_property_ui_text(prop, "Display Normals", "Display face normals as lines"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_vertex_normals", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_VERT_NORMALS); - RNA_def_property_ui_text(prop, "Draw Vertex Normals", "Display vertex normals as lines"); + RNA_def_property_ui_text(prop, "Display Vertex Normals", "Display vertex normals as lines"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_split_normals", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "overlay.edit_flag", V3D_OVERLAY_EDIT_LOOP_NORMALS); - RNA_def_property_ui_text(prop, "Draw Split Normals", "Display vertex-per-face normals as lines"); + RNA_def_property_ui_text(prop, "Display Split Normals", "Display vertex-per-face normals as lines"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "normals_length", PROP_FLOAT, PROP_FACTOR); @@ -2853,7 +2853,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) prop = RNA_def_property(srna, "use_gpencil_grid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gp_flag", V3D_GP_SHOW_GRID); RNA_def_property_ui_text(prop, "Use Grid", - "Draw a grid over grease pencil paper"); + "Display a grid over grease pencil paper"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "gpencil_grid_scale", PROP_FLOAT, PROP_NONE); @@ -3109,14 +3109,14 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Show Reconstruction", "Display reconstruction data from active movie clip"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "tracks_draw_size", PROP_FLOAT, PROP_NONE); + prop = RNA_def_property(srna, "tracks_display_size", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0.0, FLT_MAX); RNA_def_property_ui_range(prop, 0, 5, 1, 3); RNA_def_property_float_sdna(prop, NULL, "bundle_size"); RNA_def_property_ui_text(prop, "Tracks Size", "Display size of tracks from reconstructed data"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); - prop = RNA_def_property(srna, "tracks_draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "tracks_display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "bundle_drawtype"); RNA_def_property_enum_items(prop, bundle_drawtype_items); RNA_def_property_ui_text(prop, "Tracks Display Type", "Viewport display style for tracks"); @@ -3436,7 +3436,7 @@ static void rna_def_space_image(BlenderRNA *brna) /* image draw */ prop = RNA_def_property(srna, "show_repeat", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SI_DRAW_TILE); - RNA_def_property_ui_text(prop, "Draw Repeated", "Draw the image repeated outside of the main view"); + RNA_def_property_ui_text(prop, "Display Repeated", "Display the image repeated outside of the main view"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_annotation", PROP_BOOLEAN, PROP_NONE); @@ -3445,11 +3445,11 @@ static void rna_def_space_image(BlenderRNA *brna) "Show annotations for this view"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); - prop = RNA_def_property(srna, "draw_channels", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "display_channels", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); - RNA_def_property_enum_items(prop, draw_channels_items); - RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_SpaceImageEditor_draw_channels_itemf"); - RNA_def_property_ui_text(prop, "Draw Channels", "Channels of the image to draw"); + RNA_def_property_enum_items(prop, display_channels_items); + RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_SpaceImageEditor_display_channels_itemf"); + RNA_def_property_ui_text(prop, "Display Channels", "Channels of the image to draw"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_IMAGE, NULL); prop = RNA_def_property(srna, "show_stereo_3d", PROP_BOOLEAN, PROP_NONE); @@ -3570,12 +3570,12 @@ static void rna_def_space_sequencer(BlenderRNA *brna) static const EnumPropertyItem preview_channels_items[] = { {SEQ_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha", - "Draw image with RGB colors and alpha transparency"}, - {0, "COLOR", ICON_IMAGE_RGB, "Color", "Draw image with RGB colors"}, + "Display image with RGB colors and alpha transparency"}, + {0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"}, {0, NULL, 0, NULL, NULL} }; - static const EnumPropertyItem waveform_type_draw_items[] = { + static const EnumPropertyItem waveform_type_display_items[] = { {SEQ_NO_WAVEFORMS, "NO_WAVEFORMS", 0, "Waveforms Off", "No waveforms drawn for any sound strips"}, {SEQ_ALL_WAVEFORMS, "ALL_WAVEFORMS", 0, "Waveforms On", @@ -3612,7 +3612,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) prop = RNA_def_property(srna, "show_frames", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAWFRAMES); - RNA_def_property_ui_text(prop, "Draw Frames", "Draw frames rather than seconds"); + RNA_def_property_ui_text(prop, "Display Frames", "Display frames rather than seconds"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); prop = RNA_def_property(srna, "use_marker_sync", PROP_BOOLEAN, PROP_NONE); @@ -3661,16 +3661,16 @@ static void rna_def_space_sequencer(BlenderRNA *brna) prop = RNA_def_property(srna, "preview_channels", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, preview_channels_items); - RNA_def_property_ui_text(prop, "Draw Channels", "Channels of the preview to draw"); + RNA_def_property_ui_text(prop, "Display Channels", "Channels of the preview to draw"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); - prop = RNA_def_property(srna, "waveform_draw_type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "waveform_display_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); - RNA_def_property_enum_items(prop, waveform_type_draw_items); - RNA_def_property_ui_text(prop, "Waveform Drawing", "How Waveforms are drawn"); + RNA_def_property_enum_items(prop, waveform_type_display_items); + RNA_def_property_ui_text(prop, "Waveform Displaying", "How Waveforms are drawn"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); - prop = RNA_def_property(srna, "draw_overexposed", PROP_INT, PROP_NONE); + prop = RNA_def_property(srna, "show_overexposed", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "zebra"); RNA_def_property_ui_text(prop, "Show Overexposed", "Show overexposed areas with zebra stripes"); RNA_def_property_range(prop, 0, 110); @@ -3680,7 +3680,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "render_size"); RNA_def_property_enum_items(prop, proxy_render_size_items); RNA_def_property_ui_text(prop, "Proxy Render Size", - "Draw preview using full resolution or different proxy resolutions"); + "Display preview using full resolution or different proxy resolutions"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_SEQUENCER, NULL); /* grease pencil */ @@ -3884,7 +3884,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) prop = RNA_def_property(srna, "show_group_colors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NODRAWGCOLORS); RNA_def_property_ui_text(prop, "Show Group Colors", - "Draw groups and channels with colors matching their corresponding groups " + "Display groups and channels with colors matching their corresponding groups " "(pose bones only currently)"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_DOPESHEET, NULL); @@ -4018,15 +4018,15 @@ static void rna_def_space_graph(BlenderRNA *brna) prop = RNA_def_property(srna, "use_beauty_drawing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_BEAUTYDRAW_OFF); - RNA_def_property_ui_text(prop, "Use High Quality Drawing", - "Draw F-Curves using Anti-Aliasing and other fancy effects " + RNA_def_property_ui_text(prop, "Use High Quality Display", + "Display F-Curves using Anti-Aliasing and other fancy effects " "(disable for better performance)"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL); prop = RNA_def_property(srna, "show_group_colors", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SIPO_NODRAWGCOLORS); RNA_def_property_ui_text(prop, "Show Group Colors", - "Draw groups and channels with colors matching their corresponding groups"); + "Display groups and channels with colors matching their corresponding groups"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, NULL); /* editing */ @@ -4712,9 +4712,9 @@ static void rna_def_space_node(BlenderRNA *brna) static const EnumPropertyItem backdrop_channels_items[] = { {SNODE_USE_ALPHA, "COLOR_ALPHA", ICON_IMAGE_RGB_ALPHA, "Color and Alpha", - "Draw image with RGB colors and alpha transparency"}, - {0, "COLOR", ICON_IMAGE_RGB, "Color", "Draw image with RGB colors"}, - {SNODE_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Draw alpha transparency channel"}, + "Display image with RGB colors and alpha transparency"}, + {0, "COLOR", ICON_IMAGE_RGB, "Color", "Display image with RGB colors"}, + {SNODE_SHOW_ALPHA, "ALPHA", ICON_IMAGE_ALPHA, "Alpha", "Display alpha transparency channel"}, {SNODE_SHOW_R, "RED", ICON_COLOR_RED, "Red", ""}, {SNODE_SHOW_G, "GREEN", ICON_COLOR_GREEN, "Green", ""}, {SNODE_SHOW_B, "BLUE", ICON_COLOR_BLUE, "Blue", ""}, @@ -4821,7 +4821,7 @@ static void rna_def_space_node(BlenderRNA *brna) prop = RNA_def_property(srna, "backdrop_channels", PROP_ENUM, PROP_NONE); RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag"); RNA_def_property_enum_items(prop, backdrop_channels_items); - RNA_def_property_ui_text(prop, "Draw Channels", "Channels of the image to draw"); + RNA_def_property_ui_text(prop, "Display Channels", "Channels of the image to draw"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_NODE_VIEW, NULL); /* the mx/my "cursor" in the node editor is used only by operators to store the mouse position */ diff --git a/tests/python/bl_mesh_modifiers.py b/tests/python/bl_mesh_modifiers.py index f2ab6b406bd..74eaaeb7c68 100644 --- a/tests/python/bl_mesh_modifiers.py +++ b/tests/python/bl_mesh_modifiers.py @@ -370,7 +370,7 @@ def modifier_armature_add(scene, obj): scene.objects.active = obj # display options - obj_arm.show_x_ray = True + obj_arm.show_in_front = True arm_data.draw_type = 'STICK' # apply to modifier @@ -425,7 +425,7 @@ def modifier_hook_add(scene, obj, use_vgroup=True): obj_hook = mod.object obj_hook.rotation_euler = 0, math.radians(45), 0 - obj_hook.show_x_ray = True + obj_hook.show_in_front = True if use_vgroup: mod.vertex_group = obj.vertex_groups[0].name |