From d5fb0e517ca998ce39c3c3e46274b91f6d7e5124 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 24 Oct 2015 02:44:43 +1100 Subject: Cleanup: rename 'datablocks' -> 'data-blocks' Similar to addons -> add-ons, for reading it fits better to hyphenate. --- source/blender/makesrna/intern/rna_ID.c | 16 ++-- source/blender/makesrna/intern/rna_access.c | 2 +- source/blender/makesrna/intern/rna_action.c | 5 +- source/blender/makesrna/intern/rna_animation.c | 8 +- source/blender/makesrna/intern/rna_animviz.c | 2 +- source/blender/makesrna/intern/rna_armature.c | 6 +- source/blender/makesrna/intern/rna_brush.c | 4 +- source/blender/makesrna/intern/rna_camera.c | 4 +- source/blender/makesrna/intern/rna_color.c | 2 +- source/blender/makesrna/intern/rna_controller.c | 2 +- source/blender/makesrna/intern/rna_curve.c | 6 +- source/blender/makesrna/intern/rna_group.c | 2 +- source/blender/makesrna/intern/rna_image.c | 4 +- source/blender/makesrna/intern/rna_key.c | 4 +- source/blender/makesrna/intern/rna_lamp.c | 4 +- source/blender/makesrna/intern/rna_lattice.c | 2 +- source/blender/makesrna/intern/rna_linestyle.c | 2 +- source/blender/makesrna/intern/rna_main_api.c | 112 ++++++++++++------------ source/blender/makesrna/intern/rna_mask.c | 2 +- source/blender/makesrna/intern/rna_material.c | 20 ++--- source/blender/makesrna/intern/rna_mesh.c | 20 ++--- source/blender/makesrna/intern/rna_meta.c | 4 +- source/blender/makesrna/intern/rna_movieclip.c | 4 +- source/blender/makesrna/intern/rna_nodetree.c | 8 +- source/blender/makesrna/intern/rna_object.c | 6 +- source/blender/makesrna/intern/rna_object_api.c | 2 +- source/blender/makesrna/intern/rna_particle.c | 2 +- source/blender/makesrna/intern/rna_scene.c | 22 ++--- source/blender/makesrna/intern/rna_screen.c | 2 +- source/blender/makesrna/intern/rna_sensor.c | 6 +- source/blender/makesrna/intern/rna_sequencer.c | 6 +- source/blender/makesrna/intern/rna_sound.c | 4 +- source/blender/makesrna/intern/rna_space.c | 90 +++++++++---------- source/blender/makesrna/intern/rna_speaker.c | 4 +- source/blender/makesrna/intern/rna_text.c | 4 +- source/blender/makesrna/intern/rna_text_api.c | 2 +- source/blender/makesrna/intern/rna_texture.c | 4 +- source/blender/makesrna/intern/rna_tracking.c | 4 +- source/blender/makesrna/intern/rna_ui_api.c | 4 +- source/blender/makesrna/intern/rna_userdef.c | 4 +- source/blender/makesrna/intern/rna_wm.c | 2 +- source/blender/makesrna/intern/rna_world.c | 6 +- 42 files changed, 210 insertions(+), 209 deletions(-) (limited to 'source/blender') diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index f0119c7d665..43ffc7743c5 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -911,14 +911,14 @@ static void rna_def_ID(BlenderRNA *brna) srna = RNA_def_struct(brna, "ID", NULL); RNA_def_struct_ui_text(srna, "ID", - "Base type for datablocks, defining a unique name, linking from other libraries " + "Base type for data-blocks, defining a unique name, linking from other libraries " "and garbage collection"); RNA_def_struct_flag(srna, STRUCT_ID | STRUCT_ID_REFCOUNT); RNA_def_struct_refine_func(srna, "rna_ID_refine"); RNA_def_struct_idprops_func(srna, "rna_ID_idprops"); prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); - RNA_def_property_ui_text(prop, "Name", "Unique datablock ID name"); + RNA_def_property_ui_text(prop, "Name", "Unique data-block ID name"); RNA_def_property_string_funcs(prop, "rna_ID_name_get", "rna_ID_name_length", "rna_ID_name_set"); RNA_def_property_string_maxlength(prop, MAX_ID_NAME - 2); RNA_def_property_editable_func(prop, "rna_ID_name_editable"); @@ -928,11 +928,11 @@ static void rna_def_ID(BlenderRNA *brna) prop = RNA_def_property(srna, "users", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "us"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Users", "Number of times this datablock is referenced"); + RNA_def_property_ui_text(prop, "Users", "Number of times this data-block is referenced"); prop = RNA_def_property(srna, "use_fake_user", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LIB_FAKEUSER); - RNA_def_property_ui_text(prop, "Fake User", "Save this datablock even if it has no users"); + RNA_def_property_ui_text(prop, "Fake User", "Save this data-block even if it has no users"); RNA_def_property_boolean_funcs(prop, NULL, "rna_ID_fake_user_set"); prop = RNA_def_property(srna, "tag", PROP_BOOLEAN, PROP_NONE); @@ -960,21 +960,21 @@ static void rna_def_ID(BlenderRNA *brna) prop = RNA_def_property(srna, "library", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "lib"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Library", "Library file the datablock is linked from"); + RNA_def_property_ui_text(prop, "Library", "Library file the data-block is linked from"); prop = RNA_def_pointer(srna, "preview", "ImagePreview", "Preview", - "Preview image and icon of this datablock (None if not supported for this type of data)"); + "Preview image and icon of this data-block (None if not supported for this type of data)"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_IDPreview_get", NULL, NULL, NULL); /* functions */ func = RNA_def_function(srna, "copy", "rna_ID_copy"); - RNA_def_function_ui_description(func, "Create a copy of this datablock (not supported for all datablocks)"); + RNA_def_function_ui_description(func, "Create a copy of this data-block (not supported for all data-blocks)"); parm = RNA_def_pointer(func, "id", "ID", "", "New copy of the ID"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "user_clear", "rna_ID_user_clear"); - RNA_def_function_ui_description(func, "Clear the user count of a datablock so its not saved, " + RNA_def_function_ui_description(func, "Clear the user count of a data-block so its not saved, " "on reload the data will be removed"); func = RNA_def_function(srna, "animation_data_create", "rna_ID_animation_data_create"); diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index b41568d0aba..3ec649afcc9 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -6532,7 +6532,7 @@ bool RNA_property_copy(PointerRNA *ptr, PointerRNA *fromptr, PropertyRNA *prop, * since prop in this case is just a fake wrapper around actual IDProp data, and not a 'real' PropertyRNA. */ prop = (PropertyRNA *)rna_idproperty_find(ptr, ((IDProperty *)fromprop)->name); - /* its possible the custom-prop doesn't exist on this datablock */ + /* its possible the custom-prop doesn't exist on this data-block */ if (prop == NULL) { return false; } diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index b8a490ea904..4a537f8da42 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -287,7 +287,7 @@ static void rna_def_dopesheet(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Source", "ID-Block representing source data, usually ID_SCE (i.e. Scene)"); - /* Show datablock filters */ + /* Show data-block filters */ prop = RNA_def_property(srna, "show_datablock_filters", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ADS_FLAG_SHOW_DBFILTERS); RNA_def_property_ui_text(prop, "Show Datablock Filters", @@ -395,7 +395,8 @@ static void rna_def_dopesheet(BlenderRNA *brna) prop = RNA_def_property(srna, "show_modifiers", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOMODIFIERS); - RNA_def_property_ui_text(prop, "Display Modifier Data", "Include visualization of animation data related to datablocks linked to modifiers"); + RNA_def_property_ui_text(prop, "Display Modifier Data", + "Include visualization of animation data related to data-blocks linked to modifiers"); RNA_def_property_ui_icon(prop, ICON_MODIFIER, 0); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL); diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 165c969ebc2..1fba11b89b4 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -952,7 +952,7 @@ void rna_def_animdata_common(StructRNA *srna) prop = RNA_def_property(srna, "animation_data", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "adt"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Animation Data", "Animation data for this datablock"); + RNA_def_property_ui_text(prop, "Animation Data", "Animation data for this data-block"); } static void rna_def_animdata(BlenderRNA *brna) @@ -961,7 +961,7 @@ static void rna_def_animdata(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "AnimData", NULL); - RNA_def_struct_ui_text(srna, "Animation Data", "Animation data for datablock"); + RNA_def_struct_ui_text(srna, "Animation Data", "Animation data for data-block"); RNA_def_struct_ui_icon(srna, ICON_ANIM_DATA); /* NLA */ @@ -978,7 +978,7 @@ static void rna_def_animdata(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT); RNA_def_property_pointer_funcs(prop, NULL, "rna_AnimData_action_set", NULL, "rna_Action_id_poll"); RNA_def_property_editable_func(prop, "rna_AnimData_action_editable"); - RNA_def_property_ui_text(prop, "Action", "Active Action for this datablock"); + RNA_def_property_ui_text(prop, "Action", "Active Action for this data-block"); RNA_def_property_update(prop, NC_ANIMATION | ND_NLA_ACTCHANGE, "rna_AnimData_update"); /* Active Action Settings */ @@ -1008,7 +1008,7 @@ static void rna_def_animdata(BlenderRNA *brna) prop = RNA_def_property(srna, "drivers", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "drivers", NULL); RNA_def_property_struct_type(prop, "FCurve"); - RNA_def_property_ui_text(prop, "Drivers", "The Drivers/Expressions for this datablock"); + RNA_def_property_ui_text(prop, "Drivers", "The Drivers/Expressions for this data-block"); rna_api_animdata_drivers(brna, prop); diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 719eb9f8a20..2f9582506de 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -348,7 +348,7 @@ void rna_def_animviz_common(StructRNA *srna) prop = RNA_def_property(srna, "animation_visualization", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "avs"); - RNA_def_property_ui_text(prop, "Animation Visualization", "Animation data for this datablock"); + RNA_def_property_ui_text(prop, "Animation Visualization", "Animation data for this data-block"); } static void rna_def_animviz(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 3e41ea4134c..a8ef4664fd7 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -633,7 +633,7 @@ static void rna_def_bone(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "Bone", NULL); - RNA_def_struct_ui_text(srna, "Bone", "Bone in an Armature datablock"); + RNA_def_struct_ui_text(srna, "Bone", "Bone in an Armature data-block"); RNA_def_struct_ui_icon(srna, ICON_BONE_DATA); RNA_def_struct_path_func(srna, "rna_Bone_path"); RNA_def_struct_idprops_func(srna, "rna_Bone_idprops"); @@ -732,7 +732,7 @@ static void rna_def_edit_bone(BlenderRNA *brna) srna = RNA_def_struct(brna, "EditBone", NULL); RNA_def_struct_sdna(srna, "EditBone"); RNA_def_struct_idprops_func(srna, "rna_EditBone_idprops"); - RNA_def_struct_ui_text(srna, "Edit Bone", "Editmode bone in an Armature datablock"); + RNA_def_struct_ui_text(srna, "Edit Bone", "Editmode bone in an Armature data-block"); RNA_def_struct_ui_icon(srna, ICON_BONE_DATA); RNA_define_verify_sdna(0); /* not in sdna */ @@ -921,7 +921,7 @@ static void rna_def_armature(BlenderRNA *brna) srna = RNA_def_struct(brna, "Armature", "ID"); RNA_def_struct_ui_text(srna, "Armature", - "Armature datablock containing a hierarchy of bones, usually used for rigging characters"); + "Armature data-block containing a hierarchy of bones, usually used for rigging characters"); RNA_def_struct_ui_icon(srna, ICON_ARMATURE_DATA); RNA_def_struct_sdna(srna, "bArmature"); diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 93cbd5fa246..a10b543f9b5 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -635,7 +635,7 @@ static void rna_def_brush_texture_slot(BlenderRNA *brna) srna = RNA_def_struct(brna, "BrushTextureSlot", "TextureSlot"); RNA_def_struct_sdna(srna, "MTex"); - RNA_def_struct_ui_text(srna, "Brush Texture Slot", "Texture slot for textures in a Brush datablock"); + RNA_def_struct_ui_text(srna, "Brush Texture Slot", "Texture slot for textures in a Brush data-block"); prop = RNA_def_property(srna, "angle", PROP_FLOAT, PROP_ANGLE); RNA_def_property_float_sdna(prop, NULL, "rot"); @@ -851,7 +851,7 @@ static void rna_def_brush(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "Brush", "ID"); - RNA_def_struct_ui_text(srna, "Brush", "Brush datablock for storing brush settings for painting and sculpting"); + RNA_def_struct_ui_text(srna, "Brush", "Brush data-block for storing brush settings for painting and sculpting"); RNA_def_struct_ui_icon(srna, ICON_BRUSH_DATA); /* enums */ diff --git a/source/blender/makesrna/intern/rna_camera.c b/source/blender/makesrna/intern/rna_camera.c index b82f3c88c56..341cbb70d64 100644 --- a/source/blender/makesrna/intern/rna_camera.c +++ b/source/blender/makesrna/intern/rna_camera.c @@ -118,7 +118,7 @@ static void rna_def_camera_stereo_data(BlenderRNA *brna) srna = RNA_def_struct(brna, "CameraStereoData", NULL); RNA_def_struct_sdna(srna, "CameraStereoSettings"); RNA_def_struct_nested(brna, srna, "Camera"); - RNA_def_struct_ui_text(srna, "Stereo", "Stereoscopy settings for a Camera datablock"); + RNA_def_struct_ui_text(srna, "Stereo", "Stereoscopy settings for a Camera data-block"); prop = RNA_def_property(srna, "convergence_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, convergence_mode_items); @@ -180,7 +180,7 @@ void RNA_def_camera(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "Camera", "ID"); - RNA_def_struct_ui_text(srna, "Camera", "Camera datablock for storing camera settings"); + RNA_def_struct_ui_text(srna, "Camera", "Camera data-block for storing camera settings"); RNA_def_struct_ui_icon(srna, ICON_CAMERA_DATA); /* Enums */ diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 8ea67a34fbb..bb18871afcd 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -154,7 +154,7 @@ static char *rna_ColorRamp_path(PointerRNA *ptr) { char *path = NULL; - /* handle the cases where a single datablock may have 2 ramp types */ + /* handle the cases where a single data-block may have 2 ramp types */ if (ptr->id.data) { ID *id = ptr->id.data; diff --git a/source/blender/makesrna/intern/rna_controller.c b/source/blender/makesrna/intern/rna_controller.c index 1a0f3c30b03..a5922fd6c28 100644 --- a/source/blender/makesrna/intern/rna_controller.c +++ b/source/blender/makesrna/intern/rna_controller.c @@ -287,7 +287,7 @@ void RNA_def_controller(BlenderRNA *brna) prop = RNA_def_property(srna, "text", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Text"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Text", "Text datablock with the python script"); + RNA_def_property_ui_text(prop, "Text", "Text data-block with the python script"); RNA_def_property_update(prop, NC_LOGIC, NULL); prop = RNA_def_property(srna, "module", PROP_STRING, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 65175e37518..c5e1914bd32 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1193,7 +1193,7 @@ static void rna_def_surface(BlenderRNA *brna) srna = RNA_def_struct(brna, "SurfaceCurve", "Curve"); RNA_def_struct_sdna(srna, "Curve"); - RNA_def_struct_ui_text(srna, "Surface Curve", "Curve datablock used for storing surfaces"); + RNA_def_struct_ui_text(srna, "Surface Curve", "Curve data-block used for storing surfaces"); RNA_def_struct_ui_icon(srna, ICON_SURFACE_DATA); rna_def_nurbs(brna, srna); @@ -1205,7 +1205,7 @@ static void rna_def_text(BlenderRNA *brna) srna = RNA_def_struct(brna, "TextCurve", "Curve"); RNA_def_struct_sdna(srna, "Curve"); - RNA_def_struct_ui_text(srna, "Text Curve", "Curve datablock used for storing text"); + RNA_def_struct_ui_text(srna, "Text Curve", "Curve data-block used for storing text"); RNA_def_struct_ui_icon(srna, ICON_FONT_DATA); rna_def_font(brna, srna); @@ -1336,7 +1336,7 @@ static void rna_def_curve(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "Curve", "ID"); - RNA_def_struct_ui_text(srna, "Curve", "Curve datablock storing curves, splines and NURBS"); + RNA_def_struct_ui_text(srna, "Curve", "Curve data-block storing curves, splines and NURBS"); RNA_def_struct_ui_icon(srna, ICON_CURVE_DATA); RNA_def_struct_refine_func(srna, "rna_Curve_refine"); diff --git a/source/blender/makesrna/intern/rna_group.c b/source/blender/makesrna/intern/rna_group.c index 2f9c12c713b..47bee589615 100644 --- a/source/blender/makesrna/intern/rna_group.c +++ b/source/blender/makesrna/intern/rna_group.c @@ -113,7 +113,7 @@ void RNA_def_group(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "Group", "ID"); - RNA_def_struct_ui_text(srna, "Group", "Group of Object datablocks"); + RNA_def_struct_ui_text(srna, "Group", "Group of Object data-blocks"); RNA_def_struct_ui_icon(srna, ICON_GROUP); /* this is done on save/load in readfile.c, removed if no objects are in the group */ RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT); diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 64b4d17b17d..4c70dc648db 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -496,7 +496,7 @@ static void rna_def_imageuser(BlenderRNA *brna) srna = RNA_def_struct(brna, "ImageUser", NULL); RNA_def_struct_ui_text(srna, "Image User", - "Parameters defining how an Image datablock is used by another datablock"); + "Parameters defining how an Image data-block is used by another data-block"); RNA_def_struct_path_func(srna, "rna_ImageUser_path"); prop = RNA_def_property(srna, "use_auto_refresh", PROP_BOOLEAN, PROP_NONE); @@ -649,7 +649,7 @@ static void rna_def_image(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "Image", "ID"); - RNA_def_struct_ui_text(srna, "Image", "Image datablock referencing an external or packed image"); + RNA_def_struct_ui_text(srna, "Image", "Image data-block referencing an external or packed image"); RNA_def_struct_ui_icon(srna, ICON_IMAGE_DATA); prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index b567e0f00f3..feb302bb515 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -668,7 +668,7 @@ static void rna_def_keyblock(BlenderRNA *brna) FunctionRNA *func; srna = RNA_def_struct(brna, "ShapeKey", NULL); - RNA_def_struct_ui_text(srna, "Shape Key", "Shape key in a shape keys datablock"); + RNA_def_struct_ui_text(srna, "Shape Key", "Shape key in a shape keys data-block"); RNA_def_struct_sdna(srna, "KeyBlock"); RNA_def_struct_path_func(srna, "rna_ShapeKey_path"); RNA_def_struct_ui_icon(srna, ICON_SHAPEKEY_DATA); @@ -778,7 +778,7 @@ static void rna_def_key(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "Key", "ID"); - RNA_def_struct_ui_text(srna, "Key", "Shape keys datablock containing different shapes of geometric datablocks"); + RNA_def_struct_ui_text(srna, "Key", "Shape keys data-block containing different shapes of geometric data-blocks"); RNA_def_struct_ui_icon(srna, ICON_SHAPEKEY_DATA); prop = RNA_def_property(srna, "reference_key", PROP_POINTER, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 3cd51f5d66f..5a941f8b3ad 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -189,7 +189,7 @@ static void rna_def_lamp_mtex(BlenderRNA *brna) srna = RNA_def_struct(brna, "LampTextureSlot", "TextureSlot"); RNA_def_struct_sdna(srna, "MTex"); - RNA_def_struct_ui_text(srna, "Lamp Texture Slot", "Texture slot for textures in a Lamp datablock"); + RNA_def_struct_ui_text(srna, "Lamp Texture Slot", "Texture slot for textures in a Lamp data-block"); prop = RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texco"); @@ -343,7 +343,7 @@ static void rna_def_lamp(BlenderRNA *brna) srna = RNA_def_struct(brna, "Lamp", "ID"); RNA_def_struct_refine_func(srna, "rna_Lamp_refine"); - RNA_def_struct_ui_text(srna, "Lamp", "Lamp datablock for lighting a scene"); + RNA_def_struct_ui_text(srna, "Lamp", "Lamp data-block for lighting a scene"); RNA_def_struct_ui_icon(srna, ICON_LAMP_DATA); prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_lattice.c b/source/blender/makesrna/intern/rna_lattice.c index 035e9d15641..ae77fb5e798 100644 --- a/source/blender/makesrna/intern/rna_lattice.c +++ b/source/blender/makesrna/intern/rna_lattice.c @@ -291,7 +291,7 @@ static void rna_def_lattice(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "Lattice", "ID"); - RNA_def_struct_ui_text(srna, "Lattice", "Lattice datablock defining a grid for deforming other objects"); + RNA_def_struct_ui_text(srna, "Lattice", "Lattice data-block defining a grid for deforming other objects"); RNA_def_struct_ui_icon(srna, ICON_LATTICE_DATA); prop = RNA_def_property(srna, "points_u", PROP_INT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index fe8f52469be..f64a9838e2a 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -513,7 +513,7 @@ static void rna_def_linestyle_mtex(BlenderRNA *brna) srna = RNA_def_struct(brna, "LineStyleTextureSlot", "TextureSlot"); RNA_def_struct_sdna(srna, "MTex"); - RNA_def_struct_ui_text(srna, "LineStyle Texture Slot", "Texture slot for textures in a LineStyle datablock"); + RNA_def_struct_ui_text(srna, "LineStyle Texture Slot", "Texture slot for textures in a LineStyle data-block"); prop = RNA_def_property(srna, "mapping_x", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "projx"); diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c index 029766c09f3..12994b02c64 100644 --- a/source/blender/makesrna/intern/rna_main_api.c +++ b/source/blender/makesrna/intern/rna_main_api.c @@ -864,10 +864,10 @@ void RNA_def_main_cameras(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_cameras_new"); RNA_def_function_ui_description(func, "Add a new camera to the main database"); - parm = RNA_def_string(func, "name", "Camera", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Camera", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "camera", "Camera", "", "New camera datablock"); + parm = RNA_def_pointer(func, "camera", "Camera", "", "New camera data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_cameras_remove"); @@ -900,10 +900,10 @@ void RNA_def_main_scenes(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_scenes_new"); RNA_def_function_ui_description(func, "Add a new scene to the main database"); - parm = RNA_def_string(func, "name", "Scene", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Scene", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "scene", "Scene", "", "New scene datablock"); + parm = RNA_def_pointer(func, "scene", "Scene", "", "New scene data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_scenes_remove"); @@ -937,13 +937,13 @@ void RNA_def_main_objects(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_objects_new"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Add a new object to the main database"); - parm = RNA_def_string(func, "name", "Object", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Object", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_pointer(func, "object_data", "ID", "", "Object data or None for an empty object"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "object", "Object", "", "New object datablock"); + parm = RNA_def_pointer(func, "object", "Object", "", "New object data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_objects_remove"); @@ -976,10 +976,10 @@ void RNA_def_main_materials(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_materials_new"); RNA_def_function_ui_description(func, "Add a new material to the main database"); - parm = RNA_def_string(func, "name", "Material", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Material", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "material", "Material", "", "New material datablock"); + parm = RNA_def_pointer(func, "material", "Material", "", "New material data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_materials_remove"); @@ -1016,13 +1016,13 @@ void RNA_def_main_node_groups(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_nodetree_new"); RNA_def_function_ui_description(func, "Add a new node tree to the main database"); - parm = RNA_def_string(func, "name", "NodeGroup", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "NodeGroup", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_enum(func, "type", dummy_items, 0, "Type", "The type of node_group to add"); RNA_def_property_enum_funcs(parm, NULL, NULL, "rna_Main_nodetree_type_itemf"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "tree", "NodeTree", "", "New node tree datablock"); + parm = RNA_def_pointer(func, "tree", "NodeTree", "", "New node tree data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_nodetree_remove"); @@ -1060,10 +1060,10 @@ void RNA_def_main_meshes(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_meshes_new"); RNA_def_function_ui_description(func, "Add a new mesh to the main database"); - parm = RNA_def_string(func, "name", "Mesh", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Mesh", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "mesh", "Mesh", "", "New mesh datablock"); + parm = RNA_def_pointer(func, "mesh", "Mesh", "", "New mesh data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "new_from_object", "rna_Main_meshes_new_from_object"); @@ -1112,12 +1112,12 @@ void RNA_def_main_lamps(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_lamps_new"); RNA_def_function_ui_description(func, "Add a new lamp to the main database"); - parm = RNA_def_string(func, "name", "Lamp", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Lamp", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_enum(func, "type", lamp_type_items, 0, "Type", "The type of texture to add"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "lamp", "Lamp", "", "New lamp datablock"); + parm = RNA_def_pointer(func, "lamp", "Lamp", "", "New lamp data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_lamps_remove"); @@ -1212,7 +1212,7 @@ void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_images_new"); RNA_def_function_ui_description(func, "Add a new image to the main database"); - parm = RNA_def_string(func, "name", "Image", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Image", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_int(func, "width", 1024, 1, INT_MAX, "", "Width of the image", 1, INT_MAX); RNA_def_property_flag(parm, PROP_REQUIRED); @@ -1222,7 +1222,7 @@ void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_boolean(func, "float_buffer", 0, "Float Buffer", "Create an image with floating point color"); RNA_def_boolean(func, "stereo3d", 0, "Stereo 3D", "Create left and right views"); /* return type */ - parm = RNA_def_pointer(func, "image", "Image", "", "New image datablock"); + parm = RNA_def_pointer(func, "image", "Image", "", "New image data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "load", "rna_Main_images_load"); @@ -1232,7 +1232,7 @@ void RNA_def_main_images(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_boolean(func, "check_existing", false, "", "Using existing data-block if this file is already loaded"); /* return type */ - parm = RNA_def_pointer(func, "image", "Image", "", "New image datablock"); + parm = RNA_def_pointer(func, "image", "Image", "", "New image data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_images_remove"); @@ -1265,10 +1265,10 @@ void RNA_def_main_lattices(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_lattices_new"); RNA_def_function_ui_description(func, "Add a new lattice to the main database"); - parm = RNA_def_string(func, "name", "Lattice", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Lattice", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "lattice", "Lattice", "", "New lattices datablock"); + parm = RNA_def_pointer(func, "lattice", "Lattice", "", "New lattices data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_lattices_remove"); @@ -1300,12 +1300,12 @@ void RNA_def_main_curves(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_curves_new"); RNA_def_function_ui_description(func, "Add a new curve to the main database"); - parm = RNA_def_string(func, "name", "Curve", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Curve", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_enum(func, "type", object_type_curve_items, 0, "Type", "The type of curve to add"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "curve", "Curve", "", "New curve datablock"); + parm = RNA_def_pointer(func, "curve", "Curve", "", "New curve data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_curves_remove"); @@ -1337,10 +1337,10 @@ void RNA_def_main_metaballs(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_metaballs_new"); RNA_def_function_ui_description(func, "Add a new metaball to the main database"); - parm = RNA_def_string(func, "name", "MetaBall", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "MetaBall", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "metaball", "MetaBall", "", "New metaball datablock"); + parm = RNA_def_pointer(func, "metaball", "MetaBall", "", "New metaball data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_metaballs_remove"); @@ -1377,7 +1377,7 @@ void RNA_def_main_fonts(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_boolean(func, "check_existing", false, "", "Using existing data-block if this file is already loaded"); /* return type */ - parm = RNA_def_pointer(func, "vfont", "VectorFont", "", "New font datablock"); + parm = RNA_def_pointer(func, "vfont", "VectorFont", "", "New font data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_fonts_remove"); @@ -1409,12 +1409,12 @@ void RNA_def_main_textures(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_textures_new"); RNA_def_function_ui_description(func, "Add a new texture to the main database"); - parm = RNA_def_string(func, "name", "Texture", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Texture", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_enum(func, "type", texture_type_items, 0, "Type", "The type of texture to add"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "texture", "Texture", "", "New texture datablock"); + parm = RNA_def_pointer(func, "texture", "Texture", "", "New texture data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_textures_remove"); @@ -1446,11 +1446,11 @@ void RNA_def_main_brushes(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_brushes_new"); RNA_def_function_ui_description(func, "Add a new brush to the main database"); - parm = RNA_def_string(func, "name", "Brush", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Brush", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_enum(func, "mode", object_mode_items, OB_MODE_TEXTURE_PAINT, "", "Paint Mode for the new brush"); /* return type */ - parm = RNA_def_pointer(func, "brush", "Brush", "", "New brush datablock"); + parm = RNA_def_pointer(func, "brush", "Brush", "", "New brush data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_brushes_remove"); @@ -1483,10 +1483,10 @@ void RNA_def_main_worlds(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_worlds_new"); RNA_def_function_ui_description(func, "Add a new world to the main database"); - parm = RNA_def_string(func, "name", "World", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "World", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "world", "World", "", "New world datablock"); + parm = RNA_def_pointer(func, "world", "World", "", "New world data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_worlds_remove"); @@ -1519,10 +1519,10 @@ void RNA_def_main_groups(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_groups_new"); RNA_def_function_ui_description(func, "Add a new group to the main database"); - parm = RNA_def_string(func, "name", "Group", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Group", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "group", "Group", "", "New group datablock"); + parm = RNA_def_pointer(func, "group", "Group", "", "New group data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_groups_remove"); @@ -1554,10 +1554,10 @@ void RNA_def_main_speakers(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_speakers_new"); RNA_def_function_ui_description(func, "Add a new speaker to the main database"); - parm = RNA_def_string(func, "name", "Speaker", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Speaker", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "speaker", "Speaker", "", "New speaker datablock"); + parm = RNA_def_pointer(func, "speaker", "Speaker", "", "New speaker data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_speakers_remove"); @@ -1590,10 +1590,10 @@ void RNA_def_main_texts(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_texts_new"); RNA_def_function_ui_description(func, "Add a new text to the main database"); - parm = RNA_def_string(func, "name", "Text", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Text", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "text", "Text", "", "New text datablock"); + parm = RNA_def_pointer(func, "text", "Text", "", "New text data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_texts_remove"); @@ -1606,11 +1606,11 @@ void RNA_def_main_texts(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "load", "rna_Main_texts_load"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Add a new text to the main database from a file"); - parm = RNA_def_string_file_path(func, "filepath", "Path", FILE_MAX, "", "path for the datablock"); + parm = RNA_def_string_file_path(func, "filepath", "Path", FILE_MAX, "", "path for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); parm = RNA_def_boolean(func, "internal", 0, "Make internal", "Make text file internal after loading"); /* return type */ - parm = RNA_def_pointer(func, "text", "Text", "", "New text datablock"); + parm = RNA_def_pointer(func, "text", "Text", "", "New text data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "tag", "rna_Main_texts_tag"); @@ -1637,11 +1637,11 @@ void RNA_def_main_sounds(BlenderRNA *brna, PropertyRNA *cprop) /* load func */ func = RNA_def_function(srna, "load", "rna_Main_sounds_load"); RNA_def_function_ui_description(func, "Add a new sound to the main database from a file"); - parm = RNA_def_string_file_path(func, "filepath", "Path", FILE_MAX, "", "path for the datablock"); + parm = RNA_def_string_file_path(func, "filepath", "Path", FILE_MAX, "", "path for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_boolean(func, "check_existing", false, "", "Using existing data-block if this file is already loaded"); /* return type */ - parm = RNA_def_pointer(func, "sound", "Sound", "", "New text datablock"); + parm = RNA_def_pointer(func, "sound", "Sound", "", "New text data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_sounds_remove"); @@ -1674,10 +1674,10 @@ void RNA_def_main_armatures(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_armatures_new"); RNA_def_function_ui_description(func, "Add a new armature to the main database"); - parm = RNA_def_string(func, "name", "Armature", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Armature", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "armature", "Armature", "", "New armature datablock"); + parm = RNA_def_pointer(func, "armature", "Armature", "", "New armature data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_armatures_remove"); @@ -1709,10 +1709,10 @@ void RNA_def_main_actions(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_actions_new"); RNA_def_function_ui_description(func, "Add a new action to the main database"); - parm = RNA_def_string(func, "name", "Action", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Action", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "action", "Action", "", "New action datablock"); + parm = RNA_def_pointer(func, "action", "Action", "", "New action data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_actions_remove"); @@ -1744,10 +1744,10 @@ void RNA_def_main_particles(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_particles_new"); RNA_def_function_ui_description(func, "Add a new particle settings instance to the main database"); - parm = RNA_def_string(func, "name", "ParticleSettings", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "ParticleSettings", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "particle", "ParticleSettings", "", "New particle settings datablock"); + parm = RNA_def_pointer(func, "particle", "ParticleSettings", "", "New particle settings data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_particles_remove"); @@ -1779,10 +1779,10 @@ void RNA_def_main_palettes(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_palettes_new"); RNA_def_function_ui_description(func, "Add a new palette to the main database"); - parm = RNA_def_string(func, "name", "Palette", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "Palette", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "palette", "Palette", "", "New palette datablock"); + parm = RNA_def_pointer(func, "palette", "Palette", "", "New palette data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_palettes_remove"); @@ -1818,10 +1818,10 @@ void RNA_def_main_gpencil(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "gpencil_data_addnew"); RNA_def_function_flag(func, FUNC_NO_SELF); - parm = RNA_def_string(func, "name", "GreasePencil", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "GreasePencil", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "grease_pencil", "GreasePencil", "", "New grease pencil datablock"); + parm = RNA_def_pointer(func, "grease_pencil", "GreasePencil", "", "New grease pencil data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_grease_pencil_remove"); @@ -1861,11 +1861,11 @@ void RNA_def_main_movieclips(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "load", "rna_Main_movieclip_load"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Add a new movie clip to the main database from a file"); - parm = RNA_def_string_file_path(func, "filepath", "Path", FILE_MAX, "", "path for the datablock"); + parm = RNA_def_string_file_path(func, "filepath", "Path", FILE_MAX, "", "path for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_boolean(func, "check_existing", false, "", "Using existing data-block if this file is already loaded"); /* return type */ - parm = RNA_def_pointer(func, "clip", "MovieClip", "", "New movie clip datablock"); + parm = RNA_def_pointer(func, "clip", "MovieClip", "", "New movie clip data-block"); RNA_def_function_return(func, parm); } @@ -1887,9 +1887,9 @@ void RNA_def_main_masks(BlenderRNA *brna, PropertyRNA *cprop) /* new func */ func = RNA_def_function(srna, "new", "rna_Main_mask_new"); RNA_def_function_ui_description(func, "Add a new mask with a given name to the main database"); - RNA_def_string_file_path(func, "name", NULL, MAX_ID_NAME - 2, "Mask", "Name of new mask datablock"); + RNA_def_string_file_path(func, "name", NULL, MAX_ID_NAME - 2, "Mask", "Name of new mask data-block"); /* return type */ - parm = RNA_def_pointer(func, "mask", "Mask", "", "New mask datablock"); + parm = RNA_def_pointer(func, "mask", "Mask", "", "New mask data-block"); RNA_def_function_return(func, parm); /* remove func */ @@ -1918,10 +1918,10 @@ void RNA_def_main_linestyles(BlenderRNA *brna, PropertyRNA *cprop) func = RNA_def_function(srna, "new", "rna_Main_linestyles_new"); RNA_def_function_ui_description(func, "Add a new line style instance to the main database"); - parm = RNA_def_string(func, "name", "FreestyleLineStyle", 0, "", "New name for the datablock"); + parm = RNA_def_string(func, "name", "FreestyleLineStyle", 0, "", "New name for the data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); /* return type */ - parm = RNA_def_pointer(func, "linestyle", "FreestyleLineStyle", "", "New line style datablock"); + parm = RNA_def_pointer(func, "linestyle", "FreestyleLineStyle", "", "New line style data-block"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_Main_linestyles_remove"); diff --git a/source/blender/makesrna/intern/rna_mask.c b/source/blender/makesrna/intern/rna_mask.c index 1a8cea143a1..39e8bbd0930 100644 --- a/source/blender/makesrna/intern/rna_mask.c +++ b/source/blender/makesrna/intern/rna_mask.c @@ -1037,7 +1037,7 @@ static void rna_def_mask(BlenderRNA *brna) rna_def_mask_layer(brna); srna = RNA_def_struct(brna, "Mask", "ID"); - RNA_def_struct_ui_text(srna, "Mask", "Mask datablock defining mask for compositing"); + RNA_def_struct_ui_text(srna, "Mask", "Mask data-block defining mask for compositing"); RNA_def_struct_ui_icon(srna, ICON_MOD_MASK); /* mask layers */ diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index d7e566ff431..ef16febeca5 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -501,7 +501,7 @@ static void rna_def_material_mtex(BlenderRNA *brna) srna = RNA_def_struct(brna, "MaterialTextureSlot", "TextureSlot"); RNA_def_struct_sdna(srna, "MTex"); - RNA_def_struct_ui_text(srna, "Material Texture Slot", "Texture slot for textures in a Material datablock"); + RNA_def_struct_ui_text(srna, "Material Texture Slot", "Texture slot for textures in a Material data-block"); prop = RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texco"); @@ -853,7 +853,7 @@ static void rna_def_material_gamesettings(BlenderRNA *brna) srna = RNA_def_struct(brna, "MaterialGameSettings", NULL); RNA_def_struct_sdna(srna, "GameSettings"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, "Material Game Settings", "Game Engine settings for a Material datablock"); + RNA_def_struct_ui_text(srna, "Material Game Settings", "Game Engine settings for a Material data-block"); prop = RNA_def_property(srna, "use_backface_culling", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GEMAT_BACKCULL); /* use bitflags */ @@ -1076,7 +1076,7 @@ static void rna_def_material_raymirror(BlenderRNA *brna) srna = RNA_def_struct(brna, "MaterialRaytraceMirror", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, "Material Raytrace Mirror", "Raytraced reflection settings for a Material datablock"); + RNA_def_struct_ui_text(srna, "Material Raytrace Mirror", "Raytraced reflection settings for a Material data-block"); prop = RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAYMIRROR); /* use bitflags */ @@ -1162,7 +1162,7 @@ static void rna_def_material_raytra(BlenderRNA *brna) RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); RNA_def_struct_ui_text(srna, "Material Raytrace Transparency", - "Raytraced refraction settings for a Material datablock"); + "Raytraced refraction settings for a Material data-block"); prop = RNA_def_property(srna, "ior", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ang"); @@ -1256,7 +1256,7 @@ static void rna_def_material_volume(BlenderRNA *brna) srna = RNA_def_struct(brna, "MaterialVolume", NULL); RNA_def_struct_sdna(srna, "VolumeSettings"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, "Material Volume", "Volume rendering settings for a Material datablock"); + RNA_def_struct_ui_text(srna, "Material Volume", "Volume rendering settings for a Material data-block"); prop = RNA_def_property(srna, "step_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "stepsize_type"); @@ -1399,7 +1399,7 @@ static void rna_def_material_halo(BlenderRNA *brna) srna = RNA_def_struct(brna, "MaterialHalo", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, "Material Halo", "Halo particle effect settings for a Material datablock"); + RNA_def_struct_ui_text(srna, "Material Halo", "Halo particle effect settings for a Material data-block"); prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "hasize"); @@ -1528,7 +1528,7 @@ static void rna_def_material_sss(BlenderRNA *brna) RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); RNA_def_struct_ui_text(srna, "Material Subsurface Scattering", - "Diffuse subsurface scattering settings for a Material datablock"); + "Diffuse subsurface scattering settings for a Material data-block"); prop = RNA_def_property(srna, "radius", PROP_FLOAT, PROP_COLOR | PROP_UNIT_LENGTH); RNA_def_property_float_sdna(prop, NULL, "sss_radius"); @@ -1659,7 +1659,7 @@ static void rna_def_material_strand(BlenderRNA *brna) srna = RNA_def_struct(brna, "MaterialStrand", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, "Material Strand", "Strand settings for a Material datablock"); + RNA_def_struct_ui_text(srna, "Material Strand", "Strand settings for a Material data-block"); prop = RNA_def_property(srna, "use_tangent_shading", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_TANGENT_STR); @@ -1730,7 +1730,7 @@ static void rna_def_material_physics(BlenderRNA *brna) srna = RNA_def_struct(brna, "MaterialPhysics", NULL); RNA_def_struct_sdna(srna, "Material"); RNA_def_struct_nested(brna, srna, "Material"); - RNA_def_struct_ui_text(srna, "Material Physics", "Physics settings for a Material datablock"); + RNA_def_struct_ui_text(srna, "Material Physics", "Physics settings for a Material data-block"); prop = RNA_def_property(srna, "friction", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "friction"); @@ -1806,7 +1806,7 @@ void RNA_def_material(BlenderRNA *brna) srna = RNA_def_struct(brna, "Material", "ID"); RNA_def_struct_ui_text(srna, "Material", - "Material datablock to define the appearance of geometric objects for rendering"); + "Material data-block to define the appearance of geometric objects for rendering"); RNA_def_struct_ui_icon(srna, ICON_MATERIAL_DATA); prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index ec64aa38275..f1b535168c5 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1885,7 +1885,7 @@ static void rna_def_mvert(BlenderRNA *brna) srna = RNA_def_struct(brna, "MeshVertex", NULL); RNA_def_struct_sdna(srna, "MVert"); - RNA_def_struct_ui_text(srna, "Mesh Vertex", "Vertex in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh Vertex", "Vertex in a Mesh data-block"); RNA_def_struct_path_func(srna, "rna_MeshVertex_path"); RNA_def_struct_ui_icon(srna, ICON_VERTEXSEL); @@ -1942,7 +1942,7 @@ static void rna_def_medge(BlenderRNA *brna) srna = RNA_def_struct(brna, "MeshEdge", NULL); RNA_def_struct_sdna(srna, "MEdge"); - RNA_def_struct_ui_text(srna, "Mesh Edge", "Edge in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh Edge", "Edge in a Mesh data-block"); RNA_def_struct_path_func(srna, "rna_MeshEdge_path"); RNA_def_struct_ui_icon(srna, ICON_EDGESEL); @@ -2005,7 +2005,7 @@ static void rna_def_mface(BlenderRNA *brna) srna = RNA_def_struct(brna, "MeshTessFace", NULL); RNA_def_struct_sdna(srna, "MFace"); - RNA_def_struct_ui_text(srna, "Mesh TessFace", "TessFace in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh TessFace", "TessFace in a Mesh data-block"); RNA_def_struct_path_func(srna, "rna_MeshTessFace_path"); RNA_def_struct_ui_icon(srna, ICON_FACESEL); @@ -2082,7 +2082,7 @@ static void rna_def_mloop(BlenderRNA *brna) srna = RNA_def_struct(brna, "MeshLoop", NULL); RNA_def_struct_sdna(srna, "MLoop"); - RNA_def_struct_ui_text(srna, "Mesh Loop", "Loop in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh Loop", "Loop in a Mesh data-block"); RNA_def_struct_path_func(srna, "rna_MeshLoop_path"); RNA_def_struct_ui_icon(srna, ICON_EDGESEL); @@ -2141,7 +2141,7 @@ static void rna_def_mpolygon(BlenderRNA *brna) srna = RNA_def_struct(brna, "MeshPolygon", NULL); RNA_def_struct_sdna(srna, "MPoly"); - RNA_def_struct_ui_text(srna, "Mesh Polygon", "Polygon in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh Polygon", "Polygon in a Mesh data-block"); RNA_def_struct_path_func(srna, "rna_MeshPolygon_path"); RNA_def_struct_ui_icon(srna, ICON_FACESEL); @@ -2267,7 +2267,7 @@ static void rna_def_mtface(BlenderRNA *brna) const int uv_dim[] = {4, 2}; srna = RNA_def_struct(brna, "MeshTextureFaceLayer", NULL); - RNA_def_struct_ui_text(srna, "Mesh UV Map", "UV map with assigned image textures in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh UV Map", "UV map with assigned image textures in a Mesh data-block"); RNA_def_struct_sdna(srna, "CustomDataLayer"); RNA_def_struct_path_func(srna, "rna_MeshTextureFaceLayer_path"); RNA_def_struct_ui_icon(srna, ICON_GROUP_UVS); @@ -2379,7 +2379,7 @@ static void rna_def_mtexpoly(BlenderRNA *brna) #endif srna = RNA_def_struct(brna, "MeshTexturePolyLayer", NULL); - RNA_def_struct_ui_text(srna, "Mesh UV Map", "UV map with assigned image textures in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh UV Map", "UV map with assigned image textures in a Mesh data-block"); RNA_def_struct_sdna(srna, "CustomDataLayer"); RNA_def_struct_path_func(srna, "rna_MeshTexturePolyLayer_path"); RNA_def_struct_ui_icon(srna, ICON_GROUP_UVS); @@ -2454,7 +2454,7 @@ static void rna_def_mcol(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "MeshColorLayer", NULL); - RNA_def_struct_ui_text(srna, "Mesh Vertex Color Layer", "Layer of vertex colors in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh Vertex Color Layer", "Layer of vertex colors in a Mesh data-block"); RNA_def_struct_sdna(srna, "CustomDataLayer"); RNA_def_struct_path_func(srna, "rna_MeshColorLayer_path"); RNA_def_struct_ui_icon(srna, ICON_GROUP_VCOL); @@ -2524,7 +2524,7 @@ static void rna_def_mloopcol(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "MeshLoopColorLayer", NULL); - RNA_def_struct_ui_text(srna, "Mesh Vertex Color Layer", "Layer of vertex colors in a Mesh datablock"); + RNA_def_struct_ui_text(srna, "Mesh Vertex Color Layer", "Layer of vertex colors in a Mesh data-block"); RNA_def_struct_sdna(srna, "CustomDataLayer"); RNA_def_struct_path_func(srna, "rna_MeshLoopColorLayer_path"); RNA_def_struct_ui_icon(srna, ICON_GROUP_VCOL); @@ -3241,7 +3241,7 @@ static void rna_def_mesh(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "Mesh", "ID"); - RNA_def_struct_ui_text(srna, "Mesh", "Mesh datablock defining geometric surfaces"); + RNA_def_struct_ui_text(srna, "Mesh", "Mesh data-block defining geometric surfaces"); RNA_def_struct_ui_icon(srna, ICON_MESH_DATA); prop = RNA_def_property(srna, "vertices", PROP_COLLECTION, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_meta.c b/source/blender/makesrna/intern/rna_meta.c index 5f4a7706c0e..46ffe316883 100644 --- a/source/blender/makesrna/intern/rna_meta.c +++ b/source/blender/makesrna/intern/rna_meta.c @@ -189,7 +189,7 @@ static void rna_def_metaelement(BlenderRNA *brna) srna = RNA_def_struct(brna, "MetaElement", NULL); RNA_def_struct_sdna(srna, "MetaElem"); - RNA_def_struct_ui_text(srna, "Meta Element", "Blobby element in a Metaball datablock"); + RNA_def_struct_ui_text(srna, "Meta Element", "Blobby element in a Metaball data-block"); RNA_def_struct_path_func(srna, "rna_MetaElement_path"); RNA_def_struct_ui_icon(srna, ICON_OUTLINER_DATA_META); @@ -304,7 +304,7 @@ static void rna_def_metaball(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "MetaBall", "ID"); - RNA_def_struct_ui_text(srna, "MetaBall", "Metaball datablock to defined blobby surfaces"); + RNA_def_struct_ui_text(srna, "MetaBall", "Metaball data-block to defined blobby surfaces"); RNA_def_struct_ui_icon(srna, ICON_META_DATA); prop = RNA_def_property(srna, "elements", PROP_COLLECTION, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index 9ccde654af2..19d78361019 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -222,7 +222,7 @@ static void rna_def_moviecliUser(BlenderRNA *brna) srna = RNA_def_struct(brna, "MovieClipUser", NULL); RNA_def_struct_ui_text(srna, "Movie Clip User", - "Parameters defining how a MovieClip datablock is used by another datablock"); + "Parameters defining how a MovieClip data-block is used by another data-block"); prop = RNA_def_property(srna, "frame_current", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "framenr"); @@ -265,7 +265,7 @@ static void rna_def_movieclip(BlenderRNA *brna) }; srna = RNA_def_struct(brna, "MovieClip", "ID"); - RNA_def_struct_ui_text(srna, "MovieClip", "MovieClip datablock referencing an external movie file"); + RNA_def_struct_ui_text(srna, "MovieClip", "MovieClip data-block referencing an external movie file"); RNA_def_struct_ui_icon(srna, ICON_SEQUENCE); prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index a51dffb8ca3..da86701128a 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -2887,7 +2887,7 @@ static void rna_ShaderNodeScript_mode_set(PointerRNA *ptr, int value) nss->filepath[0] = '\0'; nss->flag &= ~NODE_SCRIPT_AUTO_UPDATE; - /* replace text datablock by filepath */ + /* replace text data-block by filepath */ if (node->id) { Text *text = (Text *)node->id; @@ -3135,7 +3135,7 @@ static EnumPropertyItem node_hair_items[] = { }; static EnumPropertyItem node_script_mode_items[] = { - {NODE_SCRIPT_INTERNAL, "INTERNAL", 0, "Internal", "Use internal text datablock"}, + {NODE_SCRIPT_INTERNAL, "INTERNAL", 0, "Internal", "Use internal text data-block"}, {NODE_SCRIPT_EXTERNAL, "EXTERNAL", 0, "External", "Use external .osl or .oso file"}, {0, NULL, 0, NULL, NULL} }; @@ -7943,7 +7943,7 @@ static void rna_def_nodetree(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "gpd"); RNA_def_property_struct_type(prop, "GreasePencil"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT); - RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil datablock"); + RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil data-block"); RNA_def_property_update(prop, NC_NODE, NULL); prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); @@ -8081,7 +8081,7 @@ static void rna_def_shader_nodetree(BlenderRNA *brna) srna = RNA_def_struct(brna, "ShaderNodeTree", "NodeTree"); RNA_def_struct_ui_text(srna, "Shader Node Tree", - "Node tree consisting of linked nodes used for materials (and other shading datablocks)"); + "Node tree consisting of linked nodes used for materials (and other shading data-blocks)"); RNA_def_struct_sdna(srna, "bNodeTree"); RNA_def_struct_ui_icon(srna, ICON_MATERIAL); } diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 39739867c8b..f36b2a9c81d 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1601,7 +1601,7 @@ static void rna_def_material_slot(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Material"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_MaterialSlot_material_get", "rna_MaterialSlot_material_set", NULL, NULL); - RNA_def_property_ui_text(prop, "Material", "Material datablock used by this material slot"); + RNA_def_property_ui_text(prop, "Material", "Material data-block used by this material slot"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_MaterialSlot_update"); prop = RNA_def_property(srna, "link", PROP_ENUM, PROP_NONE); @@ -2206,7 +2206,7 @@ static void rna_def_object(BlenderRNA *brna) static int boundbox_dimsize[] = {8, 3}; srna = RNA_def_struct(brna, "Object", "ID"); - RNA_def_struct_ui_text(srna, "Object", "Object datablock defining an object in a scene"); + RNA_def_struct_ui_text(srna, "Object", "Object data-block defining an object in a scene"); RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT); RNA_def_struct_ui_icon(srna, ICON_OBJECT_DATA); @@ -2780,7 +2780,7 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "gpd"); RNA_def_property_struct_type(prop, "GreasePencil"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT); - RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil datablock"); + RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil data-block"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL); /* pose */ diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index a446f119132..628dd98eaf7 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -537,7 +537,7 @@ void RNA_api_object(StructRNA *srna) /* mesh */ func = RNA_def_function(srna, "to_mesh", "rna_Object_to_mesh"); - RNA_def_function_ui_description(func, "Create a Mesh datablock with modifiers applied"); + RNA_def_function_ui_description(func, "Create a Mesh data-block with modifiers applied"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_pointer(func, "scene", "Scene", "", "Scene within which to evaluate modifiers"); RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 6676e9dc1c4..f27e620fa5b 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -1724,7 +1724,7 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) srna = RNA_def_struct(brna, "ParticleSettingsTextureSlot", "TextureSlot"); RNA_def_struct_sdna(srna, "MTex"); RNA_def_struct_ui_text(srna, "Particle Settings Texture Slot", - "Texture slot for textures in a Particle Settings datablock"); + "Texture slot for textures in a Particle Settings data-block"); prop = RNA_def_property(srna, "texture_coords", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "texco"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 5fb6fa19fda..403b59f1371 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -330,7 +330,7 @@ EnumPropertyItem normal_swizzle_items[] = { }; EnumPropertyItem bake_save_mode_items[] = { - {R_BAKE_SAVE_INTERNAL, "INTERNAL", 0, "Internal", "Save the baking map in an internal image datablock"}, + {R_BAKE_SAVE_INTERNAL, "INTERNAL", 0, "Internal", "Save the baking map in an internal image data-block"}, {R_BAKE_SAVE_EXTERNAL, "EXTERNAL", 0, "External", "Save the baking map in an external file"}, {0, NULL, 0, NULL, NULL} }; @@ -2052,12 +2052,12 @@ static void rna_def_tool_settings(BlenderRNA *brna) }; static EnumPropertyItem gpencil_source_3d_items[] = { - {GP_TOOL_SOURCE_SCENE, "SCENE", 0, "Scene", + {GP_TOOL_SOURCE_SCENE, "SCENE", 0, "Scene", "Grease Pencil data attached to the current scene is used, " - "unless the active object already has Grease Pencil data (i.e. for old files)"}, + "unless the active object already has Grease Pencil data (i.e. for old files)"}, {GP_TOOL_SOURCE_OBJECT, "OBJECT", 0, "Object", - "Grease Pencil datablocks attached to the active object are used " - "(required using pre 2.73 add-ons, e.g. BSurfaces)"}, + "Grease Pencil data-blocks attached to the active object are used " + "(required using pre 2.73 add-ons, e.g. BSurfaces)"}, {0, NULL, 0, NULL, NULL} }; @@ -3398,7 +3398,7 @@ static void rna_def_freestyle_settings(BlenderRNA *brna) srna = RNA_def_struct(brna, "FreestyleSettings", NULL); RNA_def_struct_sdna(srna, "FreestyleConfig"); RNA_def_struct_nested(brna, srna, "SceneRenderLayer"); - RNA_def_struct_ui_text(srna, "Freestyle Settings", "Freestyle settings for a SceneRenderLayer datablock"); + RNA_def_struct_ui_text(srna, "Freestyle Settings", "Freestyle settings for a SceneRenderLayer data-block"); prop = RNA_def_property(srna, "modules", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "modules", NULL); @@ -3482,7 +3482,7 @@ static void rna_def_scene_game_recast_data(BlenderRNA *brna) srna = RNA_def_struct(brna, "SceneGameRecastData", NULL); RNA_def_struct_sdna(srna, "RecastData"); RNA_def_struct_nested(brna, srna, "Scene"); - RNA_def_struct_ui_text(srna, "Recast Data", "Recast data for a Game datablock"); + RNA_def_struct_ui_text(srna, "Recast Data", "Recast data for a Game data-block"); prop = RNA_def_property(srna, "cell_size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "cellsize"); @@ -3586,7 +3586,7 @@ static void rna_def_bake_data(BlenderRNA *brna) srna = RNA_def_struct(brna, "BakeSettings", NULL); RNA_def_struct_sdna(srna, "BakeData"); RNA_def_struct_nested(brna, srna, "RenderSettings"); - RNA_def_struct_ui_text(srna, "Bake Data", "Bake data for a Scene datablock"); + RNA_def_struct_ui_text(srna, "Bake Data", "Bake data for a Scene data-block"); prop = RNA_def_property(srna, "cage_object", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "cage"); @@ -3779,7 +3779,7 @@ static void rna_def_scene_game_data(BlenderRNA *brna) srna = RNA_def_struct(brna, "SceneGameData", NULL); RNA_def_struct_sdna(srna, "GameData"); RNA_def_struct_nested(brna, srna, "Scene"); - RNA_def_struct_ui_text(srna, "Game Data", "Game data for a Scene datablock"); + RNA_def_struct_ui_text(srna, "Game Data", "Game data for a Scene data-block"); prop = RNA_def_property(srna, "resolution_x", PROP_INT, PROP_PIXEL); RNA_def_property_int_sdna(prop, NULL, "xplay"); @@ -5081,7 +5081,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_struct_sdna(srna, "RenderData"); RNA_def_struct_nested(brna, srna, "Scene"); RNA_def_struct_path_func(srna, "rna_RenderSettings_path"); - RNA_def_struct_ui_text(srna, "Render Data", "Rendering settings for a Scene datablock"); + RNA_def_struct_ui_text(srna, "Render Data", "Rendering settings for a Scene data-block"); /* Render Data */ prop = RNA_def_property(srna, "image_settings", PROP_POINTER, PROP_NONE); @@ -6505,7 +6505,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "gpd"); RNA_def_property_struct_type(prop, "GreasePencil"); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT); - RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil datablock"); + RNA_def_property_ui_text(prop, "Grease Pencil Data", "Grease Pencil data-block"); RNA_def_property_update(prop, NC_GPENCIL | ND_DATA | NA_EDITED, NULL); /* Transform Orientations */ diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index 477a9dbca4f..d21aafc7b94 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -374,7 +374,7 @@ static void rna_def_screen(BlenderRNA *brna) srna = RNA_def_struct(brna, "Screen", "ID"); RNA_def_struct_sdna(srna, "Screen"); /* it is actually bScreen but for 2.5 the dna is patched! */ - RNA_def_struct_ui_text(srna, "Screen", "Screen datablock, defining the layout of areas in a window"); + RNA_def_struct_ui_text(srna, "Screen", "Screen data-block, defining the layout of areas in a window"); RNA_def_struct_ui_icon(srna, ICON_SPLITSCREEN); /* pointers */ diff --git a/source/blender/makesrna/intern/rna_sensor.c b/source/blender/makesrna/intern/rna_sensor.c index dec305de192..2e2c4d459b4 100644 --- a/source/blender/makesrna/intern/rna_sensor.c +++ b/source/blender/makesrna/intern/rna_sensor.c @@ -590,7 +590,7 @@ static void rna_def_actuator_sensor(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Actuator Sensor", "Sensor to detect state modifications of actuators"); RNA_def_struct_sdna_from(srna, "bActuatorSensor", "data"); - /* XXX if eventually have Logics using RNA 100%, we could use the actuator datablock isntead of its name */ + /* XXX if eventually have Logics using RNA 100%, we could use the actuator data-block isntead of its name */ prop = RNA_def_property(srna, "actuator", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "name"); RNA_def_property_ui_text(prop, "Actuator", "Actuator name, actuator active state modifications will be detected"); @@ -660,7 +660,7 @@ static void rna_def_collision_sensor(BlenderRNA *brna) RNA_def_property_update(prop, NC_LOGIC, NULL); #if 0 - /* XXX either use a datablock look up to store the string name (material) + /* XXX either use a data-block look up to store the string name (material) * or to do a doversion and use a material pointer. */ prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Material"); @@ -768,7 +768,7 @@ static void rna_def_ray_sensor(BlenderRNA *brna) RNA_def_property_update(prop, NC_LOGIC, NULL); #if 0 - /* XXX either use a datablock look up to store the string name (material) + /* XXX either use a data-block look up to store the string name (material) * or to do a doversion and use a material pointer. */ prop = RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Material"); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 2192eae9fe6..4d606275066 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -558,7 +558,7 @@ static char *rna_Sequence_path(PointerRNA *ptr) Sequence *seq = (Sequence *)ptr->data; /* sequencer data comes from scene... - * TODO: would be nice to make SequenceEditor data a datablock of its own (for shorter paths) + * TODO: would be nice to make SequenceEditor data a data-block of its own (for shorter paths) */ if (seq->name + 2) { char name_esc[(sizeof(seq->name) - 2) * 2]; @@ -1604,7 +1604,7 @@ static void rna_def_editor(BlenderRNA *brna) {0, NULL, 0, NULL, NULL} }; srna = RNA_def_struct(brna, "SequenceEditor", NULL); - RNA_def_struct_ui_text(srna, "Sequence Editor", "Sequence editing data for a Scene datablock"); + RNA_def_struct_ui_text(srna, "Sequence Editor", "Sequence editing data for a Scene data-block"); RNA_def_struct_ui_icon(srna, ICON_SEQUENCE); RNA_def_struct_sdna(srna, "Editing"); @@ -2029,7 +2029,7 @@ static void rna_def_sound(BlenderRNA *brna) prop = RNA_def_property(srna, "sound", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Sound"); - RNA_def_property_ui_text(prop, "Sound", "Sound datablock used by this sequence"); + RNA_def_property_ui_text(prop, "Sound", "Sound data-block used by this sequence"); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update"); prop = RNA_def_property(srna, "volume", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_sound.c b/source/blender/makesrna/intern/rna_sound.c index 25b3475c423..6aacede5816 100644 --- a/source/blender/makesrna/intern/rna_sound.c +++ b/source/blender/makesrna/intern/rna_sound.c @@ -74,14 +74,14 @@ static void rna_def_sound(BlenderRNA *brna) srna = RNA_def_struct(brna, "Sound", "ID"); RNA_def_struct_sdna(srna, "bSound"); - RNA_def_struct_ui_text(srna, "Sound", "Sound datablock referencing an external or packed sound file"); + RNA_def_struct_ui_text(srna, "Sound", "Sound data-block referencing an external or packed sound file"); RNA_def_struct_ui_icon(srna, ICON_SOUND); /*rna_def_ipo_common(srna); */ prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH); RNA_def_property_string_sdna(prop, NULL, "name"); - RNA_def_property_ui_text(prop, "File Path", "Sound sample file used by this Sound datablock"); + RNA_def_property_ui_text(prop, "File Path", "Sound sample file used by this Sound data-block"); RNA_def_property_update(prop, 0, "rna_Sound_update"); prop = RNA_def_property(srna, "packed_file", PROP_POINTER, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index b9db36628ee..5338d4b3900 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -77,8 +77,8 @@ EnumPropertyItem space_type_items[] = { {SPACE_NODE, "NODE_EDITOR", ICON_NODETREE, "Node Editor", "Editor for node-based shading and compositing tools"}, {SPACE_LOGIC, "LOGIC_EDITOR", ICON_LOGIC, "Logic Editor", "Game logic editing"}, {0, "", ICON_NONE, NULL, NULL}, - {SPACE_BUTS, "PROPERTIES", ICON_BUTS, "Properties", "Edit properties of active object and related datablocks"}, - {SPACE_OUTLINER, "OUTLINER", ICON_OOPS, "Outliner", "Overview of scene graph and all available datablocks"}, + {SPACE_BUTS, "PROPERTIES", ICON_BUTS, "Properties", "Edit properties of active object and related data-blocks"}, + {SPACE_OUTLINER, "OUTLINER", ICON_OOPS, "Outliner", "Overview of scene graph and all available data-blocks"}, {SPACE_USERPREF, "USER_PREFERENCES", ICON_PREFERENCES, "User Preferences", "Edit persistent configuration settings"}, {SPACE_INFO, "INFO", ICON_INFO, "Info", "Main menu bar and list of error messages (drag down to expand and display)"}, {0, "", ICON_NONE, NULL, NULL}, @@ -2024,20 +2024,20 @@ static void rna_def_space_outliner(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem display_mode_items[] = { - {SO_ALL_SCENES, "ALL_SCENES", 0, "All Scenes", "Display datablocks in all scenes"}, - {SO_CUR_SCENE, "CURRENT_SCENE", 0, "Current Scene", "Display datablocks in current scene"}, - {SO_VISIBLE, "VISIBLE_LAYERS", 0, "Visible Layers", "Display datablocks in visible layers"}, - {SO_SELECTED, "SELECTED", 0, "Selected", "Display datablocks of selected objects"}, - {SO_ACTIVE, "ACTIVE", 0, "Active", "Display datablocks of active object"}, + {SO_ALL_SCENES, "ALL_SCENES", 0, "All Scenes", "Display data-blocks in all scenes"}, + {SO_CUR_SCENE, "CURRENT_SCENE", 0, "Current Scene", "Display data-blocks in current scene"}, + {SO_VISIBLE, "VISIBLE_LAYERS", 0, "Visible Layers", "Display data-blocks in visible layers"}, + {SO_SELECTED, "SELECTED", 0, "Selected", "Display data-blocks of selected objects"}, + {SO_ACTIVE, "ACTIVE", 0, "Active", "Display data-blocks of active object"}, {SO_SAME_TYPE, "SAME_TYPES", 0, "Same Types", - "Display datablocks of all objects of same type as selected object"}, - {SO_GROUPS, "GROUPS", 0, "Groups", "Display groups and their datablocks"}, - {SO_SEQUENCE, "SEQUENCE", 0, "Sequence", "Display sequence datablocks"}, + "Display data-blocks of all objects of same type as selected object"}, + {SO_GROUPS, "GROUPS", 0, "Groups", "Display groups and their data-blocks"}, + {SO_SEQUENCE, "SEQUENCE", 0, "Sequence", "Display sequence data-blocks"}, {SO_LIBRARIES, "LIBRARIES", 0, "Blender File", "Display data of current file and linked libraries"}, - {SO_DATABLOCKS, "DATABLOCKS", 0, "Datablocks", "Display all raw datablocks"}, - {SO_USERDEF, "USER_PREFERENCES", 0, "User Preferences", "Display the user preference datablocks"}, + {SO_DATABLOCKS, "DATABLOCKS", 0, "Data-Blocks", "Display all raw data-blocks"}, + {SO_USERDEF, "USER_PREFERENCES", 0, "User Preferences", "Display user preference data"}, {SO_ID_ORPHANS, "ORPHAN_DATA", 0, "Orphan Data", - "Display datablocks which are unused and/or will be lost when the file is reloaded"}, + "Display data-blocks which are unused and/or will be lost when the file is reloaded"}, {0, NULL, 0, NULL, NULL} }; @@ -3283,7 +3283,7 @@ static void rna_def_space_text(BlenderRNA *brna) /* find */ prop = RNA_def_property(srna, "use_find_all", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", ST_FIND_ALL); - RNA_def_property_ui_text(prop, "Find All", "Search in all text datablocks, instead of only the active one"); + RNA_def_property_ui_text(prop, "Find All", "Search in all text data-blocks, instead of only the active one"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TEXT, NULL); prop = RNA_def_property(srna, "use_find_wrap", PROP_BOOLEAN, PROP_NONE); @@ -3750,36 +3750,36 @@ static void rna_def_fileselect_params(BlenderRNA *brna) }; static EnumPropertyItem file_filter_idtypes_items[] = { - {FILTER_ID_AC, "ACTION", ICON_ANIM_DATA, "Actions", "Show/hide Action datablocks"}, - {FILTER_ID_AR, "ARMATURE", ICON_ARMATURE_DATA, "Armatures", "Show/hide Armature datablocks"}, - {FILTER_ID_BR, "BRUSH", ICON_BRUSH_DATA, "Brushes", "Show/hide Brushes datablocks"}, - {FILTER_ID_CA, "CAMERA", ICON_CAMERA_DATA, "Cameras", "Show/hide Camera datablocks"}, - {FILTER_ID_CU, "CURVE", ICON_CURVE_DATA, "Curves", "Show/hide Curve datablocks"}, - {FILTER_ID_GD, "GREASE_PENCIL", ICON_GREASEPENCIL, "Grease Pencil", "Show/hide Grease pencil datablocks"}, - {FILTER_ID_GR, "GROUP", ICON_GROUP, "Groups", "Show/hide Group datablocks"}, - {FILTER_ID_IM, "IMAGE", ICON_IMAGE_DATA, "Images", "Show/hide Image datablocks"}, - {FILTER_ID_LA, "LAMP", ICON_LAMP_DATA, "Lamps", "Show/hide Lamp datablocks"}, + {FILTER_ID_AC, "ACTION", ICON_ANIM_DATA, "Actions", "Show/hide Action data-blocks"}, + {FILTER_ID_AR, "ARMATURE", ICON_ARMATURE_DATA, "Armatures", "Show/hide Armature data-blocks"}, + {FILTER_ID_BR, "BRUSH", ICON_BRUSH_DATA, "Brushes", "Show/hide Brushes data-blocks"}, + {FILTER_ID_CA, "CAMERA", ICON_CAMERA_DATA, "Cameras", "Show/hide Camera data-blocks"}, + {FILTER_ID_CU, "CURVE", ICON_CURVE_DATA, "Curves", "Show/hide Curve data-blocks"}, + {FILTER_ID_GD, "GREASE_PENCIL", ICON_GREASEPENCIL, "Grease Pencil", "Show/hide Grease pencil data-blocks"}, + {FILTER_ID_GR, "GROUP", ICON_GROUP, "Groups", "Show/hide Group data-blocks"}, + {FILTER_ID_IM, "IMAGE", ICON_IMAGE_DATA, "Images", "Show/hide Image data-blocks"}, + {FILTER_ID_LA, "LAMP", ICON_LAMP_DATA, "Lamps", "Show/hide Lamp data-blocks"}, {FILTER_ID_LS, "LINESTYLE", ICON_LINE_DATA, - "Freestyle Linestyles", "Show/hide Freestyle's Line Style datablocks"}, - {FILTER_ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattices", "Show/hide Lattice datablocks"}, - {FILTER_ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Materials", "Show/hide Material datablocks"}, - {FILTER_ID_MB, "METABALL", ICON_META_DATA, "Metaballs", "Show/hide Metaball datablocks"}, - {FILTER_ID_MC, "MOVIE_CLIP", ICON_CLIP, "Movie Clips", "Show/hide Movie Clip datablocks"}, - {FILTER_ID_ME, "MESH", ICON_MESH_DATA, "Meshes", "Show/hide Mesh datablocks"}, - {FILTER_ID_MSK, "MASK", ICON_MOD_MASK, "Masks", "Show/hide Mask datablocks"}, - {FILTER_ID_NT, "NODE_TREE", ICON_NODETREE, "Node Trees", "Show/hide Node Tree datablocks"}, - {FILTER_ID_OB, "OBJECT", ICON_OBJECT_DATA, "Objects", "Show/hide Object datablocks"}, + "Freestyle Linestyles", "Show/hide Freestyle's Line Style data-blocks"}, + {FILTER_ID_LT, "LATTICE", ICON_LATTICE_DATA, "Lattices", "Show/hide Lattice data-blocks"}, + {FILTER_ID_MA, "MATERIAL", ICON_MATERIAL_DATA, "Materials", "Show/hide Material data-blocks"}, + {FILTER_ID_MB, "METABALL", ICON_META_DATA, "Metaballs", "Show/hide Metaball data-blocks"}, + {FILTER_ID_MC, "MOVIE_CLIP", ICON_CLIP, "Movie Clips", "Show/hide Movie Clip data-blocks"}, + {FILTER_ID_ME, "MESH", ICON_MESH_DATA, "Meshes", "Show/hide Mesh data-blocks"}, + {FILTER_ID_MSK, "MASK", ICON_MOD_MASK, "Masks", "Show/hide Mask data-blocks"}, + {FILTER_ID_NT, "NODE_TREE", ICON_NODETREE, "Node Trees", "Show/hide Node Tree data-blocks"}, + {FILTER_ID_OB, "OBJECT", ICON_OBJECT_DATA, "Objects", "Show/hide Object data-blocks"}, {FILTER_ID_PA, "PARTICLE_SETTINGS", ICON_PARTICLE_DATA, - "Particles Settings", "Show/hide Particle Settings datablocks"}, - {FILTER_ID_PAL, "PALETTE", ICON_COLOR, "Palettes", "Show/hide Palette datablocks"}, - {FILTER_ID_PC, "PAINT_CURVE", ICON_CURVE_BEZCURVE, "Paint Curves", "Show/hide Paint Curve datablocks"}, - {FILTER_ID_SCE, "SCENE", ICON_SCENE_DATA, "Scenes", "Show/hide Scene datablocks"}, - {FILTER_ID_SPK, "SPEAKER", ICON_SPEAKER, "Speakers", "Show/hide Speaker datablocks"}, - {FILTER_ID_SO, "SOUND", ICON_SOUND, "Sounds", "Show/hide Sound datablocks"}, - {FILTER_ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Textures", "Show/hide Texture datablocks"}, - {FILTER_ID_TXT, "TEXT", ICON_TEXT, "Texts", "Show/hide Text datablocks"}, - {FILTER_ID_VF, "FONT", ICON_FONT_DATA, "Fonts", "Show/hide Font datablocks"}, - {FILTER_ID_WO, "WORLD", ICON_WORLD_DATA, "Worlds", "Show/hide World datablocks"}, + "Particles Settings", "Show/hide Particle Settings data-blocks"}, + {FILTER_ID_PAL, "PALETTE", ICON_COLOR, "Palettes", "Show/hide Palette data-blocks"}, + {FILTER_ID_PC, "PAINT_CURVE", ICON_CURVE_BEZCURVE, "Paint Curves", "Show/hide Paint Curve data-blocks"}, + {FILTER_ID_SCE, "SCENE", ICON_SCENE_DATA, "Scenes", "Show/hide Scene data-blocks"}, + {FILTER_ID_SPK, "SPEAKER", ICON_SPEAKER, "Speakers", "Show/hide Speaker data-blocks"}, + {FILTER_ID_SO, "SOUND", ICON_SOUND, "Sounds", "Show/hide Sound data-blocks"}, + {FILTER_ID_TE, "TEXTURE", ICON_TEXTURE_DATA, "Textures", "Show/hide Texture data-blocks"}, + {FILTER_ID_TXT, "TEXT", ICON_TEXT, "Texts", "Show/hide Text data-blocks"}, + {FILTER_ID_VF, "FONT", ICON_FONT_DATA, "Fonts", "Show/hide Font data-blocks"}, + {FILTER_ID_WO, "WORLD", ICON_WORLD_DATA, "Worlds", "Show/hide World data-blocks"}, {0, NULL, 0, NULL, NULL} }; @@ -4261,7 +4261,7 @@ static void rna_def_space_node(BlenderRNA *brna) prop = RNA_def_property(srna, "id_from", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "from"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "ID From", "Datablock from which the edited datablock is linked"); + RNA_def_property_ui_text(prop, "ID From", "Datablock from which the edited data-block is linked"); prop = RNA_def_property(srna, "path", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "treepath", NULL); @@ -4439,8 +4439,8 @@ static void rna_def_space_clip(BlenderRNA *brna) }; static EnumPropertyItem gpencil_source_items[] = { - {SC_GPENCIL_SRC_CLIP, "CLIP", 0, "Clip", "Show grease pencil datablock which belongs to movie clip"}, - {SC_GPENCIL_SRC_TRACK, "TRACK", 0, "Track", "Show grease pencil datablock which belongs to active track"}, + {SC_GPENCIL_SRC_CLIP, "CLIP", 0, "Clip", "Show grease pencil data-block which belongs to movie clip"}, + {SC_GPENCIL_SRC_TRACK, "TRACK", 0, "Track", "Show grease pencil data-block which belongs to active track"}, {0, NULL, 0, NULL, NULL} }; diff --git a/source/blender/makesrna/intern/rna_speaker.c b/source/blender/makesrna/intern/rna_speaker.c index 31a4e672983..f47b54c2d95 100644 --- a/source/blender/makesrna/intern/rna_speaker.c +++ b/source/blender/makesrna/intern/rna_speaker.c @@ -55,7 +55,7 @@ static void rna_def_speaker(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "Speaker", "ID"); - RNA_def_struct_ui_text(srna, "Speaker", "Speaker datablock for 3D audio speaker objects"); + RNA_def_struct_ui_text(srna, "Speaker", "Speaker data-block for 3D audio speaker objects"); RNA_def_struct_ui_icon(srna, ICON_SPEAKER); prop = RNA_def_property(srna, "muted", PROP_BOOLEAN, PROP_NONE); @@ -75,7 +75,7 @@ static void rna_def_speaker(BlenderRNA *brna) RNA_def_property_struct_type(prop, "Sound"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Sound", "Sound datablock used by this speaker"); + RNA_def_property_ui_text(prop, "Sound", "Sound data-block used by this speaker"); /* RNA_def_property_float_funcs(prop, NULL, "rna_Speaker_sound_set", NULL); */ /* RNA_def_property_update(prop, 0, "rna_Speaker_update"); */ diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c index fb9d447850a..474fc3e5dc7 100644 --- a/source/blender/makesrna/intern/rna_text.c +++ b/source/blender/makesrna/intern/rna_text.c @@ -133,7 +133,7 @@ static void rna_def_text_line(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "TextLine", NULL); - RNA_def_struct_ui_text(srna, "Text Line", "Line of text in a Text datablock"); + RNA_def_struct_ui_text(srna, "Text Line", "Line of text in a Text data-block"); prop = RNA_def_property(srna, "body", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_TextLine_body_get", "rna_TextLine_body_length", "rna_TextLine_body_set"); @@ -148,7 +148,7 @@ static void rna_def_text(BlenderRNA *brna) PropertyRNA *prop; srna = RNA_def_struct(brna, "Text", "ID"); - RNA_def_struct_ui_text(srna, "Text", "Text datablock referencing an external or packed text file"); + RNA_def_struct_ui_text(srna, "Text", "Text data-block referencing an external or packed text file"); RNA_def_struct_ui_icon(srna, ICON_TEXT); RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT); diff --git a/source/blender/makesrna/intern/rna_text_api.c b/source/blender/makesrna/intern/rna_text_api.c index de398bc10a6..2478ad0fe1a 100644 --- a/source/blender/makesrna/intern/rna_text_api.c +++ b/source/blender/makesrna/intern/rna_text_api.c @@ -62,7 +62,7 @@ void RNA_api_text(StructRNA *srna) func = RNA_def_function(srna, "write", "rna_Text_write"); RNA_def_function_ui_description(func, "write text at the cursor location and advance to the end of the text block"); - prop = RNA_def_string(func, "text", "Text", 0, "", "New text for this datablock"); + prop = RNA_def_string(func, "text", "Text", 0, "", "New text for this data-block"); RNA_def_property_flag(prop, PROP_REQUIRED); } diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 726744782ed..5424855ccf4 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -660,7 +660,7 @@ static void rna_def_mtex(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "tex"); RNA_def_property_struct_type(prop, "Texture"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Texture", "Texture datablock used by this texture slot"); + RNA_def_property_ui_text(prop, "Texture", "Texture data-block used by this texture slot"); RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_LINKS, "rna_TextureSlot_update"); prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); @@ -2021,7 +2021,7 @@ static void rna_def_texture(BlenderRNA *brna) srna = RNA_def_struct(brna, "Texture", "ID"); RNA_def_struct_sdna(srna, "Tex"); - RNA_def_struct_ui_text(srna, "Texture", "Texture datablock used by materials, lamps, worlds and brushes"); + RNA_def_struct_ui_text(srna, "Texture", "Texture data-block used by materials, lamps, worlds and brushes"); RNA_def_struct_ui_icon(srna, ICON_TEXTURE_DATA); RNA_def_struct_refine_func(srna, "rna_Texture_refine"); diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c index 5a70d47a19a..cc396e82df5 100644 --- a/source/blender/makesrna/intern/rna_tracking.c +++ b/source/blender/makesrna/intern/rna_tracking.c @@ -926,7 +926,7 @@ static void rna_def_trackingSettings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_default_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "default_algorithm_flag", TRACK_ALGORITHM_FLAG_USE_MASK); RNA_def_property_ui_text(prop, "Use Mask", - "Use a grease pencil datablock as a mask to use only specified areas of pattern " + "Use a grease pencil data-block as a mask to use only specified areas of pattern " "when tracking"); RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL); @@ -1304,7 +1304,7 @@ static void rna_def_trackingTrack(BlenderRNA *brna) prop = RNA_def_property(srna, "use_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "algorithm_flag", TRACK_ALGORITHM_FLAG_USE_MASK); RNA_def_property_ui_text(prop, "Use Mask", - "Use a grease pencil datablock as a mask to use only specified areas of pattern " + "Use a grease pencil data-block as a mask to use only specified areas of pattern " "when tracking"); RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 81b6a77f683..33cb8373abb 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -698,10 +698,10 @@ void RNA_api_ui_layout(StructRNA *srna) func = RNA_def_function(srna, "template_preview", "uiTemplatePreview"); RNA_def_function_ui_description(func, "Item. A preview window for materials, textures, lamps or worlds"); RNA_def_function_flag(func, FUNC_USE_CONTEXT); - parm = RNA_def_pointer(func, "id", "ID", "", "ID datablock"); + parm = RNA_def_pointer(func, "id", "ID", "", "ID data-block"); RNA_def_property_flag(parm, PROP_REQUIRED); RNA_def_boolean(func, "show_buttons", true, "", "Show preview buttons?"); - RNA_def_pointer(func, "parent", "ID", "", "ID datablock"); + RNA_def_pointer(func, "parent", "ID", "", "ID data-block"); RNA_def_pointer(func, "slot", "TextureSlot", "", "Texture slot"); RNA_def_string(func, "preview_id", NULL, 0, "", "Identifier of this preview widget, if not set the ID type will be used " diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index f2e62e6f559..20483f28f26 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4550,7 +4550,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) prop = RNA_def_property(srna, "show_hidden_files_datablocks", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_HIDE_DOT); - RNA_def_property_ui_text(prop, "Hide Dot Files/Datablocks", "Hide files/datablocks that start with a dot (.*)"); + RNA_def_property_ui_text(prop, "Hide Dot Files/Datablocks", "Hide files/data-blocks that start with a dot (.*)"); prop = RNA_def_property(srna, "use_filter_files", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_FILTERFILEEXTS); @@ -4685,7 +4685,7 @@ static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cpro RNA_def_function_flag(func, FUNC_NO_SELF); RNA_def_function_ui_description(func, "Add a new add-on"); /* return type */ - parm = RNA_def_pointer(func, "addon", "Addon", "", "Addon datablock"); + parm = RNA_def_pointer(func, "addon", "Addon", "", "Add-on data"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_userdef_addon_remove"); diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 5091760a7ec..867d29fea88 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -1947,7 +1947,7 @@ static void rna_def_windowmanager(BlenderRNA *brna) srna = RNA_def_struct(brna, "WindowManager", "ID"); RNA_def_struct_ui_text(srna, "Window Manager", - "Window manager datablock defining open windows and other user interface data"); + "Window manager data-block defining open windows and other user interface data"); RNA_def_struct_clear_flag(srna, STRUCT_ID_REFCOUNT); RNA_def_struct_sdna(srna, "wmWindowManager"); diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index 3f55ad9c668..f950ba75c42 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -142,7 +142,7 @@ static void rna_def_world_mtex(BlenderRNA *brna) srna = RNA_def_struct(brna, "WorldTextureSlot", "TextureSlot"); RNA_def_struct_sdna(srna, "MTex"); - RNA_def_struct_ui_text(srna, "World Texture Slot", "Texture slot for textures in a World datablock"); + RNA_def_struct_ui_text(srna, "World Texture Slot", "Texture slot for textures in a World data-block"); /* map to */ prop = RNA_def_property(srna, "use_map_blend", PROP_BOOLEAN, PROP_NONE); @@ -238,7 +238,7 @@ static void rna_def_lighting(BlenderRNA *brna) srna = RNA_def_struct(brna, "WorldLighting", NULL); RNA_def_struct_sdna(srna, "World"); RNA_def_struct_nested(brna, srna, "World"); - RNA_def_struct_ui_text(srna, "Lighting", "Lighting for a World datablock"); + RNA_def_struct_ui_text(srna, "Lighting", "Lighting for a World data-block"); /* ambient occlusion */ prop = RNA_def_property(srna, "use_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); @@ -447,7 +447,7 @@ void RNA_def_world(BlenderRNA *brna) srna = RNA_def_struct(brna, "World", "ID"); RNA_def_struct_ui_text(srna, "World", - "World datablock describing the environment and ambient lighting of a scene"); + "World data-block describing the environment and ambient lighting of a scene"); RNA_def_struct_ui_icon(srna, ICON_WORLD_DATA); rna_def_animdata_common(srna); -- cgit v1.2.3