diff options
36 files changed, 48 insertions, 48 deletions
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake index 125c1b2df85..ccdc00ee0d8 100644 --- a/build_files/build_environment/cmake/openvdb.cmake +++ b/build_files/build_environment/cmake/openvdb.cmake @@ -50,9 +50,9 @@ set(OPENVDB_EXTRA_ARGS ) if(WIN32) - #Namespaces seem to be buggy and cause linker erorrs due to things not - #being in the correct namespace - #needs to link pthreads due to it being a blosc dependency + # Namespaces seem to be buggy and cause linker errors due to things not + # being in the correct namespace + # needs to link pthreads due to it being a blosc dependency set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS} -DOPENEXR_NAMESPACE_VERSIONING=OFF -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC2.lib diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake index ccef8a825b7..89cbe8c6ae2 100644 --- a/build_files/build_environment/cmake/python.cmake +++ b/build_files/build_environment/cmake/python.cmake @@ -142,7 +142,7 @@ if(MSVC) COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd - #xxlimited is an example extention module, we don't need to ship it and debug doesn't build it + #xxlimited is an example extension module, we don't need to ship it and debug doesn't build it #leaving it commented out, so I won't get confused again with the next update. #COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libssl-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libssl-1_1${SSL_POSTFIX}.dll diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 8ac1fd51075..7cc78edad9c 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -1205,7 +1205,7 @@ compile_Boost() { if [ ! -d $_inst ]; then INFO "Building Boost-$BOOST_VERSION" - # Rebuild dependecies as well! + # Rebuild dependencies as well! OIIO_FORCE_BUILD=true OIIO_FORCE_REBUILD=true OSL_FORCE_BUILD=true @@ -1398,7 +1398,7 @@ compile_ILMBASE() { if [ ! -d $_openexr_inst ]; then INFO "Building ILMBase-$ILMBASE_VERSION" - # Rebuild dependecies as well! + # Rebuild dependencies as well! OPENEXR_FORCE_BUILD=true OPENEXR_FORCE_REBUILD=true @@ -1494,7 +1494,7 @@ compile_OPENEXR() { if [ ! -d $_inst ]; then INFO "Building OpenEXR-$OPENEXR_VERSION" - # Rebuild dependecies as well! + # Rebuild dependencies as well! OIIO_FORCE_BUILD=true OIIO_FORCE_REBUILD=true @@ -1608,7 +1608,7 @@ compile_OIIO() { if [ ! -d $_inst ]; then INFO "Building OpenImageIO-$OIIO_VERSION" - # Rebuild dependecies as well! + # Rebuild dependencies as well! OSL_FORCE_BUILD=true OSL_FORCE_REBUILD=true @@ -1750,7 +1750,7 @@ compile_LLVM() { if [ ! -d $_inst ]; then INFO "Building LLVM-$LLVM_VERSION (CLANG included!)" - # Rebuild dependecies as well! + # Rebuild dependencies as well! OSL_FORCE_BUILD=true OSL_FORCE_REBUILD=true @@ -2076,7 +2076,7 @@ compile_BLOSC() { if [ ! -d $_inst ]; then INFO "Building Blosc-$OPENVDB_BLOSC_VERSION" - # Rebuild dependecies as well! + # Rebuild dependencies as well! OPENVDB_FORCE_BUILD=true OPENVDB_FORCE_REBUILD=true diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index a6924972e42..84e1fbdb35c 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -75,7 +75,7 @@ SET(_python_SEARCH_DIRS "/opt/lib/python-${PYTHON_VERSION}" ) -# only search for the dirs if we havn't already +# only search for the dirs if we haven't already IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_LIB_PATH_DEF)) SET(_PYTHON_ABI_FLAGS_TEST "m;mu;u; " # release diff --git a/build_files/cmake/clang_array_check.py b/build_files/cmake/clang_array_check.py index 6eaaebce52f..ad7974e2176 100644 --- a/build_files/cmake/clang_array_check.py +++ b/build_files/cmake/clang_array_check.py @@ -130,7 +130,7 @@ def function_parm_wash_tokens(parm): ) """ - Return tolens without trailing commads and 'const' + Return tolens without trailing commands and 'const' """ tokens = [t for t in parm.get_tokens()] diff --git a/build_files/cmake/cmake_consistency_check.py b/build_files/cmake/cmake_consistency_check.py index 443657532de..ab87095874f 100755 --- a/build_files/cmake/cmake_consistency_check.py +++ b/build_files/cmake/cmake_consistency_check.py @@ -285,7 +285,7 @@ def main(): ignore_used = [False] * len(IGNORE) # now check on files not accounted for. - print("\nC/C++ Files CMake doesnt know about...") + print("\nC/C++ Files CMake does not know about...") for cf in sorted(source_list(SOURCE_DIR, is_c)): if not is_ignore(cf, ignore_used): if cf not in global_c: @@ -302,7 +302,7 @@ def main(): print("bad_c: ", cf) ''' - print("\nC/C++ Headers CMake doesnt know about...") + print("\nC/C++ Headers CMake does not know about...") for hf in sorted(source_list(SOURCE_DIR, is_c_header)): if not is_ignore(hf, ignore_used): if hf not in global_h: diff --git a/build_files/cmake/cmake_netbeans_project.py b/build_files/cmake/cmake_netbeans_project.py index 97eb6b245f5..02a800fe6f1 100755 --- a/build_files/cmake/cmake_netbeans_project.py +++ b/build_files/cmake/cmake_netbeans_project.py @@ -71,7 +71,7 @@ def create_nb_project_main(): if (includes, defines) == (None, None): return - # for some reason it doesnt give all internal includes + # for some reason it doesn't give all internal includes includes = list(set(includes) | set(dirname(f) for f in files if is_c_header(f))) includes.sort() diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py index 231784df588..ee9f2e3f58e 100755 --- a/build_files/cmake/cmake_qtcreator_project.py +++ b/build_files/cmake/cmake_qtcreator_project.py @@ -85,7 +85,7 @@ def create_qtc_project_main(name): if (includes, defines) == (None, None): return - # for some reason it doesnt give all internal includes + # for some reason it doesn't give all internal includes includes = list(set(includes) | set(os.path.dirname(f) for f in files_rel if is_c_header(f))) includes.sort() diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index c896c0452b3..e38d1781b5d 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -1,4 +1,4 @@ -# Turn everything ON thats expected for an official release builds. +# Turn everything ON that's expected for an official release builds. # # Example usage: # cmake -C../blender/build_files/cmake/config/blender_full.cmake ../blender diff --git a/build_files/cmake/config/blender_headless.cmake b/build_files/cmake/config/blender_headless.cmake index 4399eb9e5c4..18a023af99c 100644 --- a/build_files/cmake/config/blender_headless.cmake +++ b/build_files/cmake/config/blender_headless.cmake @@ -9,7 +9,7 @@ set(WITH_HEADLESS ON CACHE BOOL "" FORCE) set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) # disable audio, its possible some devs may want this but for now disable -# so the python module doesnt hold the audio device and loads quickly. +# so the python module doesn't hold the audio device and loads quickly. set(WITH_AUDASPACE OFF CACHE BOOL "" FORCE) set(WITH_FFTW3 OFF CACHE BOOL "" FORCE) set(WITH_JACK OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 121a82f8059..f475bb0714a 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -1,4 +1,4 @@ -# Turn everything ON thats expected for an official release builds. +# Turn everything ON that's expected for an official release builds. # # Example usage: # cmake -C../blender/build_files/cmake/config/blender_release.cmake ../blender diff --git a/build_files/cmake/config/bpy_module.cmake b/build_files/cmake/config/bpy_module.cmake index 854d6e49370..c90fafc60ab 100644 --- a/build_files/cmake/config/bpy_module.cmake +++ b/build_files/cmake/config/bpy_module.cmake @@ -16,7 +16,7 @@ set(WITH_PYTHON_INSTALL OFF CACHE BOOL "" FORCE) set(WITH_GAMEENGINE OFF CACHE BOOL "" FORCE) # disable audio, its possible some devs may want this but for now disable -# so the python module doesnt hold the audio device and loads quickly. +# so the python module doesn't hold the audio device and loads quickly. set(WITH_AUDASPACE OFF CACHE BOOL "" FORCE) set(WITH_FFTW3 OFF CACHE BOOL "" FORCE) set(WITH_JACK OFF CACHE BOOL "" FORCE) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 69a1eb2eb3a..be24de94c7b 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -199,7 +199,7 @@ endfunction() # Support per-target CMake flags # Read from: CMAKE_C_FLAGS_**** (made upper case) when set. # -# 'name' should alway match the target name, +# 'name' should always match the target name, # use this macro before add_library or add_executable. # # Optionally takes an arg passed to set(), eg PARENT_SCOPE. @@ -509,7 +509,7 @@ function(setup_liblinks target_link_libraries(${target} ${GFLAGS_LIBRARIES}) endif() - # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them.. + # We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES depends on them.. if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV) target_link_libraries(${target} "extern_clew") if(WITH_CUDA_DYNLOAD) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index b10a2e175c1..c7bef56c090 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -408,7 +408,7 @@ if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") endif() -# Get rid of eventually clashes, we export some symbols explicite as local +# Get rid of eventually clashes, we export some symbols explicitly as local set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'" ) diff --git a/build_files/cmake/platform/platform_apple_xcode.cmake b/build_files/cmake/platform/platform_apple_xcode.cmake index 7af69c092cc..04fda25b7f5 100644 --- a/build_files/cmake/platform/platform_apple_xcode.cmake +++ b/build_files/cmake/platform/platform_apple_xcode.cmake @@ -83,7 +83,7 @@ if(${XCODE_VERSION} VERSION_LESS 4.3) # use guaranteed existing sdk set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE) else() - # note: xcode-select path could be ambigous, + # note: xcode-select path could be ambiguous, # cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed # so i use a selfcomposed bundlepath here set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform) @@ -97,7 +97,7 @@ else() endif() if(OSX_SYSTEM MATCHES 10.9) - # make sure syslibs and headers are looked up in sdk ( expecially for 10.9 openGL atm. ) + # make sure syslibs and headers are looked up in sdk ( especially for 10.9 openGL atm. ) set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT}) endif() diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index bc6ebeab97c..f8643a558ff 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -305,7 +305,7 @@ if(WITH_BOOST) if(Boost_USE_STATIC_LIBS AND WITH_BOOST_ICU) find_package(IcuLinux) endif() - mark_as_advanced(Boost_DIR) # why doesnt boost do this? + mark_as_advanced(Boost_DIR) # why doesn't boost do this? endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) diff --git a/build_files/utils/build_tgz.sh b/build_files/utils/build_tgz.sh index c568d17db1c..203e58d5a68 100755 --- a/build_files/utils/build_tgz.sh +++ b/build_files/utils/build_tgz.sh @@ -63,7 +63,7 @@ echo "OK" # Create checksum file cd "$BASE_DIR" -echo -n "Createing checksum: \"$BASE_DIR/$TARBALL.md5sum\" ..." +echo -n "Creating checksum: \"$BASE_DIR/$TARBALL.md5sum\" ..." md5sum "$TARBALL" > "$TARBALL.md5sum" echo "OK" diff --git a/build_files/windows/check_libraries.cmd b/build_files/windows/check_libraries.cmd index 90c50293720..506728a194f 100644 --- a/build_files/windows/check_libraries.cmd +++ b/build_files/windows/check_libraries.cmd @@ -26,7 +26,7 @@ if NOT EXIST %BUILD_VS_LIBDIR% ( :RETRY "%SVN%" checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/%BUILD_VS_SVNDIR% %BUILD_VS_LIBDIR% if errorlevel 1 ( - set /p LibRetry= "Error during donwload, retry? y/n" + set /p LibRetry= "Error during download, retry? y/n" if /I "!LibRetry!"=="Y" ( cd %BUILD_VS_LIBDIR% "%SVN%" cleanup diff --git a/build_files/windows/detect_msvc_classic.cmd b/build_files/windows/detect_msvc_classic.cmd index 61bfcf92ddf..2910e3b7305 100644 --- a/build_files/windows/detect_msvc_classic.cmd +++ b/build_files/windows/detect_msvc_classic.cmd @@ -64,6 +64,6 @@ exit /b 1 :DetectionComplete if NOT "%verbose%" == "" ( - echo Visual Studio %BUILD_VS_YEAR% Detected successfuly + echo Visual Studio %BUILD_VS_YEAR% Detected successfully ) exit /b 0 diff --git a/build_files/windows/find_dependencies.cmd b/build_files/windows/find_dependencies.cmd index 4f38b0af256..a861cf1c98b 100644 --- a/build_files/windows/find_dependencies.cmd +++ b/build_files/windows/find_dependencies.cmd @@ -1,4 +1,4 @@ -REM find all dependencies and set the corresponding environement variables. +REM find all dependencies and set the corresponding environment variables. for %%X in (svn.exe) do (set SVN=%%~$PATH:X) for %%X in (cmake.exe) do (set CMAKE=%%~$PATH:X) for %%X in (git.exe) do (set GIT=%%~$PATH:X) diff --git a/build_files/windows/show_help.cmd b/build_files/windows/show_help.cmd index 694b28c88ed..984c1ccfbeb 100644 --- a/build_files/windows/show_help.cmd +++ b/build_files/windows/show_help.cmd @@ -16,7 +16,7 @@ echo. echo Configuration options echo - verbose ^(enable diagnostic output during configuration^) echo - with_tests ^(enable building unit tests^) -echo - noge ^(disable building game enginge and player^) +echo - noge ^(disable building game engine and player^) echo - debug ^(Build an unoptimized debuggable build^) echo - packagename [newname] ^(override default cpack package name^) echo - buildir [newdir] ^(override default build folder^) diff --git a/doc/python_api/examples/bpy.app.handlers.1.py b/doc/python_api/examples/bpy.app.handlers.1.py index 34b16c27b86..cd24873fcbc 100644 --- a/doc/python_api/examples/bpy.app.handlers.1.py +++ b/doc/python_api/examples/bpy.app.handlers.1.py @@ -3,7 +3,7 @@ Persistent Handler Example ++++++++++++++++++++++++++ By default handlers are freed when loading new files, in some cases you may -wan't the handler stay running across multiple files (when the handler is +want the handler stay running across multiple files (when the handler is part of an add-on for example). For this the :data:`bpy.app.handlers.persistent` decorator needs to be used. diff --git a/doc/python_api/rst/info_api_reference.rst b/doc/python_api/rst/info_api_reference.rst index ab690a8ee06..130aa68a6b3 100644 --- a/doc/python_api/rst/info_api_reference.rst +++ b/doc/python_api/rst/info_api_reference.rst @@ -53,7 +53,7 @@ Here are some characteristics ID Data-Blocks share. Simple Data Access ------------------ -Lets start with a simple case, say you want a python script to adjust the objects location. +Lets start with a simple case, say you want a python script to adjust the object's location. Start by finding this setting in the interface ``Properties Window -> Object -> Transform -> Location`` diff --git a/release/scripts/startup/bl_operators/object_randomize_transform.py b/release/scripts/startup/bl_operators/object_randomize_transform.py index dbc9461ad5a..1aa1f2e1d0e 100644 --- a/release/scripts/startup/bl_operators/object_randomize_transform.py +++ b/release/scripts/startup/bl_operators/object_randomize_transform.py @@ -155,7 +155,7 @@ class RandomizeLocRotSize(Operator): ) '''scale_min = FloatProperty( - name="Minimun Scale Factor", + name="Minimum Scale Factor", description="Lowest scale percentage possible", min=-1.0, max=1.0, precision=3, default=0.15, diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 318012d57ab..16a24736398 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -898,7 +898,7 @@ def main(context, projectVecs.append(averageVec.normalized()) # Get the next vec! - # Pick the face thats most different to all existing angles :) + # Pick the face that's most different to all existing angles :) mostUniqueAngle = 1.0 # 1.0 is 0d. no difference. mostUniqueIndex = 0 # dummy diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 50cef9124ab..f7688aa3aa2 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -207,7 +207,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel, Panel): obj_name = obj.name for group in bpy.data.groups: - # XXX this is slow and stupid!, we need 2 checks, one thats fast + # XXX this is slow and stupid!, we need 2 checks, one that's fast # and another that we can be sure its not a name collision # from linked library data group_objects = group.objects diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 818c218a362..2381309bc3d 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -960,7 +960,7 @@ class VIEW3D_MT_select_edit_surface(Menu): class VIEW3D_MT_select_edit_text(Menu): - # intentional name mis-match + # intentional name mismatch # select menu for 3d-text doesn't make sense bl_label = "Edit" diff --git a/source/blender/python/bmesh/bmesh_py_types.c b/source/blender/python/bmesh/bmesh_py_types.c index df01dda94c6..a53248314df 100644 --- a/source/blender/python/bmesh/bmesh_py_types.c +++ b/source/blender/python/bmesh/bmesh_py_types.c @@ -2453,7 +2453,7 @@ PyDoc_STRVAR(bpy_bmelemseq_index_update_doc, " .. note::\n" "\n" " Running this on sequences besides :class:`BMesh.verts`, :class:`BMesh.edges`, :class:`BMesh.faces`\n" -" works but won't result in each element having a valid index, insted its order in the sequence will be set.\n" +" works but wont result in each element having a valid index, instead its order in the sequence will be set.\n" ); static PyObject *bpy_bmelemseq_index_update(BPy_BMElemSeq *self) { diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 8bed0f28cba..918ec8fa018 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -944,7 +944,7 @@ PyObject *BPy_Wrap_GetKeys(IDProperty *prop) /* pass */ } - if (i != prop->len) { /* if the loop didnt finish, we know the length is wrong */ + if (i != prop->len) { /* if the loop didn't finish, we know the length is wrong */ BPy_IDGroup_CorrectListLen(prop, list, i, __func__); Py_DECREF(list); /*free the list*/ /*call self again*/ diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 46f80bf79f9..ae0e40c8561 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -618,7 +618,7 @@ const char *PyC_UnicodeAsByteAndSize(PyObject *py_str, Py_ssize_t *size, PyObjec if (result) { /* 99% of the time this is enough but we better support non unicode - * chars since blender doesnt limit this */ + * chars since blender doesn't limit this */ return result; } else { @@ -671,7 +671,7 @@ PyObject *PyC_UnicodeFromByteAndSize(const char *str, Py_ssize_t size) PyObject *result = PyUnicode_FromStringAndSize(str, size); if (result) { /* 99% of the time this is enough but we better support non unicode - * chars since blender doesnt limit this */ + * chars since blender doesn't limit this */ return result; } else { diff --git a/source/blender/python/intern/bpy_path.c b/source/blender/python/intern/bpy_path.c index f182972ba9c..53d8f8ea954 100644 --- a/source/blender/python/intern/bpy_path.c +++ b/source/blender/python/intern/bpy_path.c @@ -23,7 +23,7 @@ /** \file blender/python/intern/bpy_path.c * \ingroup pythonintern * - * This file defines '_bpy_path' module, Some 'C' funtionality used by 'bpy.path' + * This file defines '_bpy_path' module, Some 'C' functionality used by 'bpy.path' */ #include <Python.h> diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 28a6a4f7fb0..b542f32f844 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -2351,7 +2351,7 @@ static int pyrna_prop_collection_subscript_str_lib_pair_ptr( } else { PyErr_Format(PyExc_KeyError, - "%s: lib must be a sting or None, not %.200s", + "%s: lib must be a string or None, not %.200s", err_prefix, Py_TYPE(keylib)->tp_name); return -1; } @@ -4091,7 +4091,7 @@ static PyObject *pyrna_struct_meta_idprop_getattro(PyObject *cls, PyObject *attr * <bpy_struct, BoolProperty("foo")> * ...rather than returning the deferred class register tuple as checked by pyrna_is_deferred_prop() * - * Disable for now, this is faking internal behavior in a way thats too tricky to maintain well. */ + * Disable for now, this is faking internal behavior in a way that's too tricky to maintain well. */ #if 0 if (ret == NULL) { // || pyrna_is_deferred_prop(ret) StructRNA *srna = srna_from_self(cls, "StructRNA.__getattr__"); diff --git a/source/blender/python/mathutils/mathutils.c b/source/blender/python/mathutils/mathutils.c index f021d456b3a..566bac9cb09 100644 --- a/source/blender/python/mathutils/mathutils.c +++ b/source/blender/python/mathutils/mathutils.c @@ -641,7 +641,7 @@ PyMODINIT_FUNC PyInit_mathutils(void) /* submodule */ PyModule_AddObject(mod, "geometry", (submodule = PyInit_mathutils_geometry())); - /* XXX, python doesnt do imports with this usefully yet + /* XXX, python doesn't do imports with this usefully yet * 'from mathutils.geometry import PolyFill' * ...fails without this. */ PyDict_SetItem(sys_modules, PyModule_GetNameObject(submodule), submodule); diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index d935949fd8c..c759653c5cf 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -1265,7 +1265,7 @@ static PyObject *M_Geometry_tessellate_polygon(PyObject *UNUSED(self), PyObject BKE_displist_fill(&dispbase, &dispbase, NULL, false); /* The faces are stored in a new DisplayList - * thats added to the head of the listbase */ + * that's added to the head of the listbase */ dl = dispbase.first; tri_list = PyList_New(dl->parts); diff --git a/tests/python/bl_run_operators.py b/tests/python/bl_run_operators.py index aae78a84132..9a3f801b04a 100644 --- a/tests/python/bl_run_operators.py +++ b/tests/python/bl_run_operators.py @@ -136,7 +136,7 @@ def filter_op_list(operators): def reset_blend(): bpy.ops.wm.read_factory_settings() for scene in bpy.data.scenes: - # reduce range so any bake action doesnt take too long + # reduce range so any bake action doesn't take too long scene.frame_start = 1 scene.frame_end = 5 diff --git a/tests/python/bl_test.py b/tests/python/bl_test.py index 0cb322a21b1..ceb5811438a 100644 --- a/tests/python/bl_test.py +++ b/tests/python/bl_test.py @@ -181,7 +181,7 @@ def main(): sys.exit(1) if md5 != md5_new: - print(" Running: %s\n MD5 Recieved: %s\n MD5 Expected: %s" % (run, md5_new, md5)) + print(" Running: %s\n MD5 Received: %s\n MD5 Expected: %s" % (run, md5_new, md5)) sys.exit(1) print(" Success: %s" % run) |