diff options
9 files changed, 29 insertions, 21 deletions
diff --git a/source/blender/blenkernel/intern/multires_reshape.h b/source/blender/blenkernel/intern/multires_reshape.h index ae14e565ac9..9029d19ae88 100644 --- a/source/blender/blenkernel/intern/multires_reshape.h +++ b/source/blender/blenkernel/intern/multires_reshape.h @@ -101,22 +101,27 @@ typedef struct MultiresReshapeContext { int *face_ptex_offset; } MultiresReshapeContext; -/* Coordinate which identifies element of a grid. - * This is directly related on how CD_MDISPS stores dispalcement. +/** + * Coordinate which identifies element of a grid. + * This is directly related on how #CD_MDISPS stores displacement. */ typedef struct GridCoord { int grid_index; float u, v; } GridCoord; -/* COordinate within ptex, which is what OpenSubdiv API operates on. */ +/** + * Coordinate within ptex, which is what OpenSubdiv API operates on. + */ typedef struct PTexCoord { int ptex_face_index; float u, v; } PTexCoord; -/* Element of a grid data stored in the destination mesh. - * This is where reshaped coordinates and mask values will be written to. */ +/** + * Element of a grid data stored in the destination mesh. + * This is where reshaped coordinates and mask values will be written to. + */ typedef struct ReshapeGridElement { float *displacement; float *mask; @@ -270,7 +275,7 @@ void multires_reshape_assign_final_coords_from_orig_mdisps( /** \name Displacement smooth. * \{ */ -/* Operates on a displacement grids (CD_MDISPS) which contains object space coordinates stopred for +/* Operates on a displacement grids (CD_MDISPS) which contains object space coordinates stored for * the reshape level. * * The result is grids which are defining mesh with a smooth surface and details starting from @@ -278,7 +283,7 @@ void multires_reshape_assign_final_coords_from_orig_mdisps( void multires_reshape_smooth_object_grids_with_details( const MultiresReshapeContext *reshape_context); -/* Operates on a displacement grids (CD_MDISPS) which contains object spacecoordinates stopred for +/* Operates on a displacement grids (CD_MDISPS) which contains object space-coordinates stored for * the reshape level. * * Makes it so surface on top level looks smooth. Details are not preserved @@ -305,9 +310,9 @@ void multires_reshape_object_grids_to_tangent_displacement( * \{ */ /* Update mesh coordinates to the final positions of displacement in object space. - * This is effectively desired position of base mesh vertices after caneling out displacement. + * This is effectively desired position of base mesh vertices after canceling out displacement. * - * NOTE: Expects that mesh's CD_MDISPS has been set ot object space positions. */ + * NOTE: Expects that mesh's CD_MDISPS has been set to object space positions. */ void multires_reshape_apply_base_update_mesh_coords(MultiresReshapeContext *reshape_context); /* Perform better fitting of the base mesh so its subdivided version brings vertices to their diff --git a/source/blender/blenkernel/intern/multires_reshape_util.c b/source/blender/blenkernel/intern/multires_reshape_util.c index 814501996c8..f9271e37672 100644 --- a/source/blender/blenkernel/intern/multires_reshape_util.c +++ b/source/blender/blenkernel/intern/multires_reshape_util.c @@ -379,8 +379,7 @@ void multires_reshape_tangent_matrix_for_corner(const MultiresReshapeContext *re float r_tangent_matrix[3][3]) { /* For a quad faces we would need to flip the tangent, since they will use - * use different coordinates within displacement grid comparent to ptex - * face. */ + * use different coordinates within displacement grid compared to the ptex face. */ const bool is_quad = multires_reshape_is_quad_face(reshape_context, face_index); const int tangent_corner = is_quad ? corner : 0; BKE_multires_construct_tangent_matrix(r_tangent_matrix, dPdu, dPdv, tangent_corner); diff --git a/source/blender/blenkernel/intern/multires_reshape_vertcos.c b/source/blender/blenkernel/intern/multires_reshape_vertcos.c index c47b50faa03..5aff0b3caa2 100644 --- a/source/blender/blenkernel/intern/multires_reshape_vertcos.c +++ b/source/blender/blenkernel/intern/multires_reshape_vertcos.c @@ -38,8 +38,10 @@ typedef struct MultiresReshapeAssignVertcosContext { const int num_vert_coords; } MultiresReshapeAssignVertcosContext; -/* Set single displacement grid value at a reshape level to a correspnding vertex coordinate. - * This function will be called for every side of a boundary grid points for inner coordinates. */ +/** + * Set single displacement grid value at a reshape level to a corresponding vertex coordinate. + * This function will be called for every side of a boundary grid points for inner coordinates. + */ static void multires_reshape_vertcos_foreach_single_vertex( const SubdivForeachContext *foreach_context, const GridCoord *grid_coord, diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 7da080dbe9a..d54ec0f1ac1 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -5724,7 +5724,7 @@ static float ff_quad_form_factor(float *p, float *n, float *q0, float *q1, float static __m128 sse_approx_acos(__m128 x) { - /* needs a better approximation than taylor expansion of acos, since that + /* needs a better approximation than Taylor expansion of acos, since that * gives big errors for near 1.0 values, sqrt(2 * x) * acos(1 - x) should work * better, see http://www.tom.womack.net/projects/sse-fast-arctrig.html */ diff --git a/source/blender/blentranslation/BLT_translation.h b/source/blender/blentranslation/BLT_translation.h index c3667c364bc..55403cc35d3 100644 --- a/source/blender/blentranslation/BLT_translation.h +++ b/source/blender/blentranslation/BLT_translation.h @@ -89,7 +89,7 @@ bool BLT_lang_is_ime_supported(void); * NOTE: We translate BLT_I18NCONTEXT_DEFAULT as BLT_I18NCONTEXT_DEFAULT_BPY in Python, * as we can't use "natural" None value in rna string properties... :/ * The void string "" is also interpreted as BLT_I18NCONTEXT_DEFAULT. - * For perf reason, we only use the first char to detect this context, + * For performance reason, we only use the first char to detect this context, * so other contexts should never start with the same char! */ #define BLT_I18NCONTEXT_DEFAULT NULL diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index c512300200e..442b4aa406a 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -321,7 +321,7 @@ void DepsgraphNodeBuilder::begin_build() for (IDNode *id_node : graph_->id_nodes) { /* It is possible that the ID does not need to have CoW version in which case id_cow is the * same as id_orig. Additionally, such ID might have been removed, which makes the check - * for whether id_cow is expanded to access freed memory. In orderr to deal with this we + * for whether id_cow is expanded to access freed memory. In order to deal with this we * check whether CoW is needed based on a scalar value which does not lead to access of * possibly deleted memory. * Additionally, this saves some space in the map by skipping mapping for datablocks which diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 61ca2317572..1e08741db26 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -786,8 +786,8 @@ void EEVEE_lightprobes_cache_finish(EEVEE_ViewLayerData *sldata, EEVEE_Data *ved if (pinfo->do_grid_update) { scene_orig->eevee.light_cache_data->flag |= LIGHTCACHE_UPDATE_GRID; } - /* If we update grid we need to update the cubemaps too. - * So always refresh cubemaps. */ + /* If we update grid we need to update the cube-maps too. + * So always refresh cube-maps. */ scene_orig->eevee.light_cache_data->flag |= LIGHTCACHE_UPDATE_CUBE; /* Tag the lightcache to auto update. */ scene_orig->eevee.light_cache_data->flag |= LIGHTCACHE_UPDATE_AUTO; diff --git a/source/blender/draw/engines/workbench/workbench_engine.c b/source/blender/draw/engines/workbench/workbench_engine.c index b91ca7cf070..a728afa559e 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.c +++ b/source/blender/draw/engines/workbench/workbench_engine.c @@ -212,8 +212,10 @@ static void workbench_cache_hair_populate(WORKBENCH_PrivateData *wpd, DRW_shgroup_hair_create_sub(ob, psys, md, grp); } -/* Decide what colortype to draw the object with. - * In some cases it can be overwritten by workbench_material_setup(). */ +/** + * Decide what color-type to draw the object with. + * In some cases it can be overwritten by #workbench_material_setup(). + */ static eV3DShadingColorType workbench_color_type_get(WORKBENCH_PrivateData *wpd, Object *ob, bool *r_sculpt_pbvh, diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h index 86bb696a031..544fdee519f 100644 --- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h +++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h @@ -35,7 +35,7 @@ class CalligraphicShader : public StrokeShader { public: /*! Builds the shader. * \param iMinThickness: - * The minimum thickness in the direction perpandicular to the main direction. + * The minimum thickness in the direction perpendicular to the main direction. * \param iMaxThickness: * The maximum thickness in the main direction. * \param iOrientation: |