[Bf-blender-cvs] [92ab76c38ff] master: Cleanup: clang-format
Harley Acheson
noreply at git.blender.org
Fri Dec 11 19:49:48 CET 2020
Commit: 92ab76c38ff8f3ed1af5efeba00becbb319b77fb
Author: Harley Acheson
Date: Fri Dec 11 10:48:30 2020 -0800
Branches: master
https://developer.blender.org/rB92ab76c38ff8f3ed1af5efeba00becbb319b77fb
Cleanup: clang-format
Forgot to run Make Format on recent spelling changes
===================================================================
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 25fe37c2d02..b03df1a82f3 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1105,8 +1105,11 @@ bool RNA_struct_bl_idname_ok_or_report(ReportList *reports,
const bool failure = false;
#endif
if (p == NULL || p == identifier || p + len_sep >= identifier + len_id) {
- BKE_reportf(
- reports, report_level, "'%s' does not contain '%s' with prefix and suffix", identifier, sep);
+ BKE_reportf(reports,
+ report_level,
+ "'%s' does not contain '%s' with prefix and suffix",
+ identifier,
+ sep);
return failure;
}
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index 106de759cfc..58f0502ab34 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -1486,10 +1486,11 @@ static void rna_def_field(BlenderRNA *brna)
prop = RNA_def_property(srna, "texture_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "tex_mode");
RNA_def_property_enum_items(prop, texture_items);
- RNA_def_property_ui_text(prop,
- "Texture Mode",
- "How the texture effect is calculated (RGB and Curl need a RGB texture, "
- "else Gradient will be used instead)");
+ RNA_def_property_ui_text(
+ prop,
+ "Texture Mode",
+ "How the texture effect is calculated (RGB and Curl need a RGB texture, "
+ "else Gradient will be used instead)");
RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
prop = RNA_def_property(srna, "z_direction", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 44d72a65adb..d0afebe5465 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -4281,7 +4281,8 @@ static void rna_def_space_view3d(BlenderRNA *brna)
/* Camera Object Data. */
prop = RNA_def_property(srna, "show_gizmo_camera_lens", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gizmo_show_camera", V3D_GIZMO_SHOW_CAMERA_LENS);
- RNA_def_property_ui_text(prop, "Show Camera Lens", "Gizmo to adjust camera focal length or orthographic scale");
+ RNA_def_property_ui_text(
+ prop, "Show Camera Lens", "Gizmo to adjust camera focal length or orthographic scale");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_gizmo_camera_dof_distance", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 918bcb01170..2c659f06e90 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6067,10 +6067,11 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
prop = RNA_def_property(srna, "script_directory", PROP_STRING, PROP_DIRPATH);
RNA_def_property_string_sdna(prop, NULL, "pythondir");
- RNA_def_property_ui_text(prop,
- "Python Scripts Directory",
- "Alternate script path, matching the default layout with subdirectories: "
- "startup, add-ons and modules (requires restart)");
+ RNA_def_property_ui_text(
+ prop,
+ "Python Scripts Directory",
+ "Alternate script path, matching the default layout with subdirectories: "
+ "startup, add-ons and modules (requires restart)");
/* TODO, editing should reset sys.path! */
prop = RNA_def_property(srna, "i18n_branches_directory", PROP_STRING, PROP_DIRPATH);
More information about the Bf-blender-cvs
mailing list