[Bf-blender-cvs] [cb560c01b6c] master: Cleanup: clang-format, comment indentation
Campbell Barton
noreply at git.blender.org
Fri Mar 20 02:33:13 CET 2020
Commit: cb560c01b6c61241acaa848cbdeb263af8b8cecd
Author: Campbell Barton
Date: Fri Mar 20 12:23:04 2020 +1100
Branches: master
https://developer.blender.org/rBcb560c01b6c61241acaa848cbdeb263af8b8cecd
Cleanup: clang-format, comment indentation
===================================================================
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/image_save.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/physics/physics_fluid.c
M source/blender/editors/space_file/fsmenu.c
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index d131c1b4d18..45e2ff10ba4 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -741,8 +741,8 @@ static void default_get_tarmat_full_bbone(struct Depsgraph *UNUSED(depsgraph),
/* This following macro should be used for all standard single-target *_get_tars functions
* to save typing and reduce maintenance woes.
- * (Hopefully all compilers will be happy with the lines with just a space on them. Those are
- * really just to help this code easier to read)
+ * (Hopefully all compilers will be happy with the lines with just a space on them.
+ * Those are really just to help this code easier to read).
*/
// TODO: cope with getting rotation order...
#define SINGLETARGET_GET_TARS(con, datatar, datasubtarget, ct, list) \
diff --git a/source/blender/blenkernel/intern/image_save.c b/source/blender/blenkernel/intern/image_save.c
index eba6a1c9174..bd570c9688b 100644
--- a/source/blender/blenkernel/intern/image_save.c
+++ b/source/blender/blenkernel/intern/image_save.c
@@ -18,7 +18,7 @@
*/
/** \file
- * \ingroup bke
+ * \ingroup bke
*/
#include <errno.h>
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 4e4af05b17b..bc127243836 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -6919,13 +6919,14 @@ static void set_profile_spacing(BevelParams *bp, ProfileSpacing *pro_spacing, bo
/**
* Assume we have a situation like:
- *
+ * <pre>
* a d
* \ /
* A \ / C
* \ th1 th2/
* b---------c
* B
+ * </pre>
*
* where edges are A, B, and C, following a face around vertices a, b, c, d.
* th1 is angle abc and th2 is angle bcd;
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index f2ec567abf1..42e0aab8418 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2779,7 +2779,8 @@ void uiTemplatePreview(uiLayout *layout,
if (!preview_id || (preview_id[0] == '\0')) {
/* If no identifier given, generate one from ID type. */
- BLI_snprintf(_preview_id, UI_MAX_NAME_STR, "uiPreview_%s", BKE_idtype_idcode_to_name(GS(id->name)));
+ BLI_snprintf(
+ _preview_id, UI_MAX_NAME_STR, "uiPreview_%s", BKE_idtype_idcode_to_name(GS(id->name)));
preview_id = _preview_id;
}
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index bfbe1d22334..eb808398254 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -18,7 +18,7 @@
*/
/** \file
- * \ingroup edphys
+ * \ingroup edphys
*/
#include <math.h>
diff --git a/source/blender/editors/space_file/fsmenu.c b/source/blender/editors/space_file/fsmenu.c
index 08b800df7dd..66157296064 100644
--- a/source/blender/editors/space_file/fsmenu.c
+++ b/source/blender/editors/space_file/fsmenu.c
@@ -182,12 +182,12 @@ static void fsmenu_xdg_user_dirs_free(GHash *xdg_map)
}
/**
- * Add fsmenu entry for system folders on linux.
- * - Check if a path is stored in the GHash generated from user-dirs.dirs
- * - If not, check for a default path in $HOME
+ * Add fsmenu entry for system folders on linux.
+ * - Check if a path is stored in the GHash generated from user-dirs.dirs
+ * - If not, check for a default path in $HOME
*
- * \param key: Use `user-dirs.dirs` format "XDG_EXAMPLE_DIR"
- * \param default_path: Directory name to check in $HOME, also used for the menu entry name.
+ * \param key: Use `user-dirs.dirs` format "XDG_EXAMPLE_DIR"
+ * \param default_path: Directory name to check in $HOME, also used for the menu entry name.
*/
static void fsmenu_xdg_insert_entry(GHash *xdg_map,
struct FSMenu *fsmenu,
diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index c3cc3256125..2e0fe6200d1 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -81,15 +81,15 @@
* <typenr><nr_of_elems> <typenr><namenr> <typenr><namenr> ...
* \endcode
*
- * **Remember to read/write integer and short aligned!**
+ * **Remember to read/write integer and short aligned!**
*
- * While writing a file, the names of a struct is indicated with a type number,
- * to be found with: ``type = DNA_struct_find_nr(SDNA *, const char *)``
- * The value of ``type`` corresponds with the index within the structs array
+ * While writing a file, the names of a struct is indicated with a type number,
+ * to be found with: ``type = DNA_struct_find_nr(SDNA *, const char *)``
+ * The value of ``type`` corresponds with the index within the structs array
*
- * For the moment: the complete DNA file is included in a .blend file. For
- * the future we can think of smarter methods, like only included the used
- * structs. Only needed to keep a file short though...
+ * For the moment: the complete DNA file is included in a .blend file. For
+ * the future we can think of smarter methods, like only included the used
+ * structs. Only needed to keep a file short though...
*
* ALLOWED AND TESTED CHANGES IN STRUCTS:
* - Type change (a char to float will be divided by 255).
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 0695479d9fb..961854ac23e 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -1278,7 +1278,8 @@ ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short i
RNA_string_get(op->ptr, "name", name);
id = BKE_libblock_find_name(bmain, idcode, name);
if (!id) {
- BKE_reportf(op->reports, RPT_ERROR, "%s '%s' not found", BKE_idtype_idcode_to_name(idcode), name);
+ BKE_reportf(
+ op->reports, RPT_ERROR, "%s '%s' not found", BKE_idtype_idcode_to_name(idcode), name);
return NULL;
}
id_us_plus(id);
More information about the Bf-blender-cvs
mailing list