diff options
| -rw-r--r-- | intern/cycles/util/util_math.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_compiler_attrs.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/path_util.c | 2 | ||||
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 2 | ||||
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 | ||||
| -rw-r--r-- | source/tests/bl_rna_wiki_reference.py | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 69c0d84c163..ded75762cd2 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -183,7 +183,7 @@ ccl_device_inline float signf(float f) ccl_device_inline float nonzerof(float f, float eps) { - if(fabsf(f) < eps) + if(fabsf(f) < eps) return signf(f)*eps; else return f; diff --git a/source/blender/blenlib/BLI_compiler_attrs.h b/source/blender/blenlib/BLI_compiler_attrs.h index 0a93ae2566b..f0d32670229 100644 --- a/source/blender/blenlib/BLI_compiler_attrs.h +++ b/source/blender/blenlib/BLI_compiler_attrs.h @@ -42,7 +42,7 @@ /* hint to mark function arguments expected to be non-null * if no arguments are given to the macro, all of pointer - * arguments owuld be expected to be non-null + * arguments would be expected to be non-null */ #ifdef __GNUC__ # define ATTR_NONNULL(args ...) __attribute__((nonnull(args))) diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c index 77418377f11..4226a04ca5b 100644 --- a/source/blender/blenlib/intern/path_util.c +++ b/source/blender/blenlib/intern/path_util.c @@ -710,7 +710,7 @@ void BLI_path_rel(char *file, const char *relfile) * \param maxlen Maximum length of string * \param suffix String to append to the original string * \param sep Optional separator character - * \return true if succeded + * \return true if succeeded */ bool BLI_path_suffix(char *string, size_t maxlen, const char *suffix, const char *sep) { diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 305ae5283b0..f8cca0a3707 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1119,7 +1119,7 @@ static BMOpDefine bmo_subdivide_edges_def = { /* * Subdivide Edge-Ring. * - * Take an edge-ring, and supdivide with interpolation options. + * Take an edge-ring, and subdivide with interpolation options. */ static BMOpDefine bmo_subdivide_edgering_def = { "subdivide_edgering", diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index beb2ce41462..211c34ed325 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -179,7 +179,7 @@ VCOLDataWrapper::VCOLDataWrapper(COLLADAFW::MeshVertexData& vdata) : mVData(&vda void VCOLDataWrapper::get_vcol(int v_index, MLoopCol *mloopcol) { int stride = mVData->getStride(0); - if(stride == 0) stride =3; + if (stride == 0) stride = 3; switch (mVData->getType()) { case COLLADAFW::MeshVertexData::DATA_TYPE_FLOAT: diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 89bdf4df5ac..9ce6bf58a0a 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1802,7 +1802,7 @@ static void view3d_draw_bgpic(Scene *scene, ARegion *ar, View3D *v3d, glColor4f(1.0f, 1.0f, 1.0f, 1.0f - bgpic->blend); /* could not use glaDrawPixelsAuto because it could fallback to - * glaDrawPixelsSafe in some cases, which will end up in misssing + * glaDrawPixelsSafe in some cases, which will end up in missing * alpha transparency for the background image (sergey) */ glaDrawPixelsTex(x1, y1, ibuf->x, ibuf->y, GL_RGBA, GL_UNSIGNED_BYTE, GL_LINEAR, ibuf->rect); diff --git a/source/tests/bl_rna_wiki_reference.py b/source/tests/bl_rna_wiki_reference.py index d7ca80a14bd..8cb20aaf7f6 100644 --- a/source/tests/bl_rna_wiki_reference.py +++ b/source/tests/bl_rna_wiki_reference.py @@ -96,7 +96,7 @@ def test_urls(): import rna_wiki_reference import urllib.error - from urllib.request import urlopen + from urllib.request import urlopen prefix = rna_wiki_reference.url_manual_prefix urls = {suffix for (rna_id, suffix) in rna_wiki_reference.url_manual_mapping} |