Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-02-24 07:53:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-02-24 07:53:03 +0300
commitd4c0c40015111f335dfaca90ed1b8741a6ca8f76 (patch)
tree251777adad404bbadbb78d1305aee26b6a045e3b
parent5c2e10d5ed4b4e321925d4f35b049594efd66bbf (diff)
Cleanup: spelling
-rw-r--r--source/blender/blenkernel/intern/mesh_boolean_convert.cc4
-rw-r--r--source/blender/blenkernel/intern/mesh_remesh_voxel.c4
-rw-r--r--source/blender/blenlib/BLI_function_ref.hh6
-rw-r--r--source/blender/draw/engines/eevee/eevee_screen_raytrace.c2
-rw-r--r--source/blender/makesdna/DNA_object_types.h2
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mesh_boolean_convert.cc b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
index 02c99d2c5da..4b47294e61a 100644
--- a/source/blender/blenkernel/intern/mesh_boolean_convert.cc
+++ b/source/blender/blenkernel/intern/mesh_boolean_convert.cc
@@ -91,7 +91,7 @@ class MeshesToIMeshInfo {
/* Similarly for polys of meshes. */
Array<int> mesh_poly_offset;
/* For each Mesh vertex in all the meshes (with concatenated indexing),
- * what is the IMesh Vert* allocated for it in the intput IMesh? */
+ * what is the IMesh Vert* allocated for it in the input IMesh? */
Array<const Vert *> mesh_to_imesh_vert;
/* Similarly for each Mesh poly. */
Array<Face *> mesh_to_imesh_face;
@@ -832,4 +832,4 @@ Mesh *BKE_mesh_boolean(const Mesh **UNUSED(meshes),
#endif
-} // extern "C" \ No newline at end of file
+} // extern "C"
diff --git a/source/blender/blenkernel/intern/mesh_remesh_voxel.c b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
index e093e3024c3..0a5aa360553 100644
--- a/source/blender/blenkernel/intern/mesh_remesh_voxel.c
+++ b/source/blender/blenkernel/intern/mesh_remesh_voxel.c
@@ -71,7 +71,7 @@ struct OpenVDBLevelSet *BKE_mesh_remesh_voxel_ovdb_mesh_to_level_set_create(
unsigned int totverts = mesh->totvert;
float *verts = (float *)MEM_malloc_arrayN(totverts * 3, sizeof(float), "remesh_input_verts");
unsigned int *faces = (unsigned int *)MEM_malloc_arrayN(
- totfaces * 3, sizeof(unsigned int), "remesh_intput_faces");
+ totfaces * 3, sizeof(unsigned int), "remesh_input_faces");
for (unsigned int i = 0; i < totverts; i++) {
MVert *mvert = &mesh->mvert[i];
@@ -175,7 +175,7 @@ static Mesh *BKE_mesh_remesh_quadriflow(Mesh *input_mesh,
unsigned int totverts = input_mesh->totvert;
float *verts = (float *)MEM_malloc_arrayN(totverts * 3, sizeof(float), "remesh_input_verts");
unsigned int *faces = (unsigned int *)MEM_malloc_arrayN(
- totfaces * 3, sizeof(unsigned int), "remesh_intput_faces");
+ totfaces * 3, sizeof(unsigned int), "remesh_input_faces");
for (unsigned int i = 0; i < totverts; i++) {
MVert *mvert = &input_mesh->mvert[i];
diff --git a/source/blender/blenlib/BLI_function_ref.hh b/source/blender/blenlib/BLI_function_ref.hh
index 86f761bbded..57fffdc09b4 100644
--- a/source/blender/blenlib/BLI_function_ref.hh
+++ b/source/blender/blenlib/BLI_function_ref.hh
@@ -30,9 +30,9 @@
* A `FunctionRef` is small and cheap to copy. Therefore it should generally be passed by value.
*
* Example signatures:
- * FunctionRef<void()> - A function without parameters and void return type.
- * FunctionRef<int(float)> - A function with a float paramter and an int return value.
- * FunctionRef<int(int, int)> - A function with two int parameters and an int return value.
+ * `FunctionRef<void()>` - A function without parameters and void return type.
+ * `FunctionRef<int(float)>` - A function with a float parameter and an int return value.
+ * `FunctionRef<int(int, int)>` - A function with two int parameters and an int return value.
*
* There are multiple ways to achieve that, so here is a comparison of the different approaches:
* 1. Pass function pointer and user data (as void *) separately:
diff --git a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
index 97255f15d9b..f9e22f5c08d 100644
--- a/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
+++ b/source/blender/draw/engines/eevee/eevee_screen_raytrace.c
@@ -246,7 +246,7 @@ void EEVEE_reflection_compute(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *v
/* Resolve at fullres */
int samp = (DRW_state_is_image_render()) ? effects->taa_render_sample :
- effects->taa_current_sample;
+ effects->taa_current_sample;
/* Doing a neighbor shift only after a few iteration.
* We wait for a prime number of cycles to avoid noise correlation.
* This reduces variance faster. */
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 5f414aa2bdd..f6372a0c240 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -630,7 +630,7 @@ enum {
*/
#define BA_TRANSFORM_LOCKED_IN_PLACE (1 << 7)
-#define BA_TRANSFORM_CHILD (1 << 8) /* child of a transformed object */
+#define BA_TRANSFORM_CHILD (1 << 8) /* child of a transformed object */
#define BA_TRANSFORM_PARENT (1 << 13) /* parent of a transformed object */
#define OB_FROMDUPLI (1 << 9)