Commit: 6e8709caa374335447b7ac4ad201396cc81423b0
Author: Erik Abrahamsson
Date: Sun Aug 7 19:48:28 2022 +0200
Branches: master
https://developer.blender.org/rB6e8709caa374335447b7ac4ad201396cc81423b0
Cleanup: Fix typo Propatation -> Propagation
Fixes the typo in the struct `DefaultPropatationMixerStruct`.
===================================================================
M source/blender/blenkernel/BKE_attribute_math.hh
M source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_attribute_math.hh
b/source/blender/blenkernel/BKE_attribute_math.hh
index 0a8e013abf2..770937688d7 100644
--- a/source/blender/blenkernel/BKE_attribute_math.hh
+++ b/source/blender/blenkernel/BKE_attribute_math.hh
@@ -464,12 +464,12 @@ template<> struct DefaultMixerStruct<int8_t> {
using type = SimpleMixerWithAccumulationType<int8_t, float, float_to_int8_t>;
};
-template<typename T> struct DefaultPropatationMixerStruct {
+template<typename T> struct DefaultPropagationMixerStruct {
/* Use void by default. This can be checked for in `if constexpr`
statements. */
using type = typename DefaultMixerStruct<T>::type;
};
-template<> struct DefaultPropatationMixerStruct<bool> {
+template<> struct DefaultPropagationMixerStruct<bool> {
using type = BooleanPropagationMixer;
};
@@ -479,7 +479,7 @@ template<> struct DefaultPropatationMixerStruct<bool> {
* (the default mixing for booleans).
*/
template<typename T>
-using DefaultPropatationMixer = typename
DefaultPropatationMixerStruct<T>::type;
+using DefaultPropagationMixer = typename
DefaultPropagationMixerStruct<T>::type;
/* Utility to get a good default mixer for a given type. This is `void` when
there is no default
* mixer for the given type. */
diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
index acf85e74353..024dbd1c852 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc
@@ -225,7 +225,7 @@ template<typename T, typename GetMixIndicesFn>
void copy_with_mixing(MutableSpan<T> dst, Span<T> src, GetMixIndicesFn
get_mix_indices_fn)
{
threading::parallel_for(dst.index_range(), 512, [&](const IndexRange range) {
- attribute_math::DefaultPropatationMixer<T> mixer{dst.slice(range)};
+ attribute_math::DefaultPropagationMixer<T> mixer{dst.slice(range)};
for (const int i_dst : IndexRange(range.size())) {
for (const int i_src : get_mix_indices_fn(range[i_dst])) {
mixer.mix_in(i_dst, src[i_src]);
@@ -437,7 +437,7 @@ static void extrude_mesh_edges(MeshComponent &component,
Array<float3> vert_offsets;
if (!edge_offsets.is_single()) {
vert_offsets.reinitialize(orig_vert_size);
- attribute_math::DefaultPropatationMixer<float3> mixer(vert_offsets);
+ attribute_math::DefaultPropagationMixer<float3> mixer(vert_offsets);
for (const int i_edge : edge_selection) {
const MEdge &edge = orig_edges[i_edge];
const float3 offset = edge_offsets[i_edge];
@@ -583,7 +583,7 @@ static void extrude_mesh_edges(MeshComponent &component,
/* Both corners on each vertical edge of the side polygon get
the same value,
* so there are only two unique values to mix. */
Array<T> side_poly_corner_data(2);
- attribute_math::DefaultPropatationMixer<T>
mixer{side_poly_corner_data};
+ attribute_math::DefaultPropagationMixer<T>
mixer{side_poly_corner_data};
const MEdge &duplicate_edge = duplicate_edges[i_edge_selection];
const int new_vert_1 = duplicate_edge.v1;
@@ -705,7 +705,7 @@ static void extrude_mesh_face_regions(MeshComponent
&component,
Array<float3> vert_offsets;
if (!poly_offsets.is_single()) {
vert_offsets.reinitialize(orig_vert_size);
- attribute_math::DefaultPropatationMixer<float3> mixer(vert_offsets);
+ attribute_math::DefaultPropagationMixer<float3> mixer(vert_offsets);
for (const int i_poly : poly_selection) {
const MPoly &poly = orig_polys[i_poly];
const float3 offset = poly_offsets[i_poly];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
