[Bf-blender-cvs] [f159d49f56c] master: Cleanup: Fix various source typos

luzpaz noreply at git.blender.org
Tue Dec 7 04:39:57 CET 2021


Commit: f159d49f56cedccd509ee93f5a5fb51f4f39eeb8
Author: luzpaz
Date:   Mon Dec 6 22:31:05 2021 -0500
Branches: master
https://developer.blender.org/rBf159d49f56cedccd509ee93f5a5fb51f4f39eeb8

Cleanup: Fix various source typos

This is a continuation of D13462 to clean up source typos.

Differential Revision: https://developer.blender.org/D13471

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

M	source/blender/blenkernel/intern/mesh_mapping.c
M	source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl
M	source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
M	source/blender/makesrna/intern/rna_access_compare_override.c

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

diff --git a/source/blender/blenkernel/intern/mesh_mapping.c b/source/blender/blenkernel/intern/mesh_mapping.c
index d28bb9c0744..b2130bd28b5 100644
--- a/source/blender/blenkernel/intern/mesh_mapping.c
+++ b/source/blender/blenkernel/intern/mesh_mapping.c
@@ -630,7 +630,7 @@ void BKE_mesh_origindex_map_create_looptri(MeshElemMap **r_map,
 typedef bool (*MeshRemap_CheckIslandBoundary)(const struct MPoly *mpoly,
                                               const struct MLoop *mloop,
                                               const struct MEdge *medge,
-                                              const int nbr_egde_users,
+                                              const int nbr_edge_users,
                                               const struct MPoly *mpoly_array,
                                               const struct MeshElemMap *edge_poly_map,
                                               void *user_data);
@@ -833,14 +833,14 @@ static void poly_edge_loop_islands_calc(const MEdge *medge,
 static bool poly_is_island_boundary_smooth_cb(const MPoly *mp,
                                               const MLoop *UNUSED(ml),
                                               const MEdge *me,
-                                              const int nbr_egde_users,
+                                              const int nbr_edge_users,
                                               const MPoly *mpoly_array,
                                               const MeshElemMap *edge_poly_map,
                                               void *UNUSED(user_data))
 {
   /* Edge is sharp if one of its polys is flat, or edge itself is sharp,
    * or edge is not used by exactly two polygons. */
-  if ((mp->flag & ME_SMOOTH) && !(me->flag & ME_SHARP) && (nbr_egde_users == 2)) {
+  if ((mp->flag & ME_SMOOTH) && !(me->flag & ME_SHARP) && (nbr_edge_users == 2)) {
     /* In that case, edge appears to be smooth, but we need to check its other poly too. */
     const MPoly *mp_other = (mp == &mpoly_array[edge_poly_map->indices[0]]) ?
                                 &mpoly_array[edge_poly_map->indices[1]] :
@@ -1012,7 +1012,7 @@ typedef struct MeshCheckIslandBoundaryUv {
 static bool mesh_check_island_boundary_uv(const MPoly *UNUSED(mp),
                                           const MLoop *ml,
                                           const MEdge *me,
-                                          const int UNUSED(nbr_egde_users),
+                                          const int UNUSED(nbr_edge_users),
                                           const MPoly *UNUSED(mpoly_array),
                                           const MeshElemMap *UNUSED(edge_poly_map),
                                           void *user_data)
diff --git a/source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl b/source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl
index 5fd00986adc..051a08d25e6 100644
--- a/source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl
+++ b/source/blender/draw/engines/eevee/shaders/effect_dof_bokeh_frag.glsl
@@ -50,10 +50,10 @@ float circle_to_polygon_angle(float sides_count, float theta)
   float ratio = (local_theta - halfside_angle) / halfside_angle;
 
   float halfside_len = polygon_sides_length(sides_count) * 0.5;
-  float oposite = ratio * halfside_len;
+  float opposite = ratio * halfside_len;
 
   /* NOTE: atan(y_over_x) has output range [-M_PI_2..M_PI_2]. */
-  float final_local_theta = atan(oposite / adjacent);
+  float final_local_theta = atan(opposite / adjacent);
 
   return side * side_angle + final_local_theta;
 }
diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
index 69a92ba598d..7f43b7afb88 100644
--- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
+++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc
@@ -515,7 +515,7 @@ std::unique_ptr<ColumnValues> VolumeDataSource::get_column_values(
             r_cell_value.value_string = IFACE_("Level Set");
           }
           else {
-            r_cell_value.value_string = IFACE_("Unkown");
+            r_cell_value.value_string = IFACE_("Unknown");
           }
         },
         5.0f);
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c
index be8972dbff3..559e3f80abc 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.c
+++ b/source/blender/makesrna/intern/rna_access_compare_override.c
@@ -614,7 +614,7 @@ static bool rna_property_override_operation_apply(Main *bmain,
   }
 
   /* get and set the default values as appropriate for the various types */
-  const bool sucess = override_apply(bmain,
+  const bool success = override_apply(bmain,
                                      ptr_dst,
                                      ptr_src,
                                      ptr_storage,
@@ -628,11 +628,11 @@ static bool rna_property_override_operation_apply(Main *bmain,
                                      ptr_item_src,
                                      ptr_item_storage,
                                      opop);
-  if (sucess) {
+  if (success) {
     RNA_property_update_main(bmain, NULL, ptr_dst, prop_dst);
   }
 
-  return sucess;
+  return success;
 }
 
 /**



More information about the Bf-blender-cvs mailing list