[Bf-blender-cvs] [a3b785bc083] master: Cleanup: clang-format, clang-tidy, spelling

Campbell Barton noreply at git.blender.org
Wed Oct 27 06:58:33 CEST 2021


Commit: a3b785bc083f3d83198c402e00da9d610389ca98
Author: Campbell Barton
Date:   Wed Oct 27 13:59:41 2021 +1100
Branches: master
https://developer.blender.org/rBa3b785bc083f3d83198c402e00da9d610389ca98

Cleanup: clang-format, clang-tidy, spelling

===================================================================

M	source/blender/blenkernel/BKE_geometry_set.hh
M	source/blender/blenkernel/intern/armature_test.cc
M	source/blender/blenlib/BLI_serialize.hh
M	source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc
M	source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_geometry_set.hh b/source/blender/blenkernel/BKE_geometry_set.hh
index d273fe74310..a9a0b87a778 100644
--- a/source/blender/blenkernel/BKE_geometry_set.hh
+++ b/source/blender/blenkernel/BKE_geometry_set.hh
@@ -318,7 +318,8 @@ struct GeometrySet {
       bool include_instances,
       blender::Map<blender::bke::AttributeIDRef, AttributeKind> &r_attributes) const;
 
-  blender::Vector<GeometryComponentType> gather_component_types(bool include_instances, bool ignore_empty) const;
+  blender::Vector<GeometryComponentType> gather_component_types(bool include_instances,
+                                                                bool ignore_empty) const;
 
   using ForeachSubGeometryCallback = blender::FunctionRef<void(GeometrySet &geometry_set)>;
 
diff --git a/source/blender/blenkernel/intern/armature_test.cc b/source/blender/blenkernel/intern/armature_test.cc
index 2375c606247..a6d9a1f41e9 100644
--- a/source/blender/blenkernel/intern/armature_test.cc
+++ b/source/blender/blenkernel/intern/armature_test.cc
@@ -133,7 +133,7 @@ static double test_vec_roll_to_mat3_normalized(const float input[3],
   float roll_mat[3][3];
 
   if (normalize) {
-    /* The vector is renormalized to replicate the actual usage. */
+    /* The vector is re-normalized to replicate the actual usage. */
     normalize_v3_v3(input_normalized, input);
   }
   else {
diff --git a/source/blender/blenlib/BLI_serialize.hh b/source/blender/blenlib/BLI_serialize.hh
index 8bec2785f83..7b8aa03b807 100644
--- a/source/blender/blenlib/BLI_serialize.hh
+++ b/source/blender/blenlib/BLI_serialize.hh
@@ -50,20 +50,20 @@
  * The next example would format an integer value (42) as JSON the result will
  * be stored inside `out`.
  *
- * ```
+ * \code{.cc}
  * JsonFormatter json;
  * std::stringstream out;
  * IntValue test_value(42);
  * json.serialize(out, test_value);
- * ```
+ * \endcode
  *
  * ## Deserializing
  *
- * ```
- * std::stringstream is("42")
+ * \code{.cc}
+ * std::stringstream is("42");
  * JsonFormatter json;
  * std::unique_ptr<Value> value = json.deserialize(is);
- * ```
+ * \endcode
  *
  * # Adding a new formatter
  *
@@ -113,7 +113,7 @@ using ArrayValue =
  * Class containing a (de)serializable value.
  *
  * To serialize from or to a specific format the Value will be used as an intermediate container
- * holding the values. Value class is abstract. There are concreate classes to for different data
+ * holding the values. Value class is abstract. There are concrete classes to for different data
  * types.
  *
  * - `StringValue`: contains a string.
@@ -311,7 +311,7 @@ class Formatter {
 };
 
 /**
- * Formatter to (de)serialize a json formatted stream.
+ * Formatter to (de)serialize a JSON formatted stream.
  */
 class JsonFormatter : public Formatter {
  public:
diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc
index f8cc92de1eb..9edefe32fbc 100644
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_vbo_attributes.cc
@@ -63,7 +63,7 @@ static CustomData *get_custom_data_for_domain(const MeshRenderData *mr, Attribut
 
 /* Utility to convert from the type used in the attributes to the types for the VBO.
  * This is mostly used to promote integers and booleans to floats, as other types (float, float2,
- * etc.) directly map to avalaible GPU types. Booleans are still converted as attributes are vec4
+ * etc.) directly map to available GPU types. Booleans are still converted as attributes are vec4
  * in the shader.
  */
 template<typename AttributeType, typename VBOType> struct attribute_type_converter {
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 85b801eece2..f3110cf87b6 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@ -1045,21 +1045,19 @@ void MOD_lineart_chain_clip_at_border(LineartRenderBuffer *rb)
           is_inside = new_inside;
           continue;
         }
-        else {
-          /* Stroke comes in. */
-          new_eci = lineart_chain_create_crossing_point(rb, eci, prev_eci);
+        /* Stroke comes in. */
+        new_eci = lineart_chain_create_crossing_point(rb, eci, prev_eci);
 
-          ec->chain.first = eci;
-          eci->prev = NULL;
+        ec->chain.first = eci;
+        eci->prev = NULL;
 
-          BLI_addhead(&ec->chain, new_eci);
+        BLI_addhead(&ec->chain, new_eci);
 
-          ec_added = false;
+        ec_added = false;
 
-          next_eci = eci->next;
-          is_inside = new_inside;
-          continue;
-        }
+        next_eci = eci->next;
+        is_inside = new_inside;
+        continue;
       }
     }



More information about the Bf-blender-cvs mailing list