[Bf-blender-cvs] [760dbd1cbf5] master: Cleanup: misc spelling fixes

Campbell Barton noreply at git.blender.org
Thu Aug 1 06:10:42 CEST 2019 

Commit: 760dbd1cbf56e13b0a827afb6f7784fa46fff9b4
Author: Campbell Barton
Date:   Thu Aug 1 13:53:25 2019 +1000
Branches: master
https://developer.blender.org/rB760dbd1cbf56e13b0a827afb6f7784fa46fff9b4

Cleanup: misc spelling fixes

T68035 by @luzpaz

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

M	.clang-format
M	CMakeLists.txt
M	GNUmakefile
M	build_files/buildbot/config/blender_linux.cmake
M	intern/cycles/kernel/filter/filter_reconstruction.h
M	intern/cycles/kernel/svm/svm_ies.h
M	intern/cycles/render/graph.cpp
M	intern/cycles/render/osl.cpp
M	intern/ghost/intern/GHOST_SystemWin32.cpp
M	release/scripts/startup/bl_operators/userpref.py
M	source/blender/alembic/intern/alembic_capi.cc
M	source/blender/blenkernel/intern/anim_sys.c
M	source/blender/blenkernel/intern/camera.c
M	source/blender/blenkernel/intern/displist.c
M	source/blender/blenkernel/intern/dynamicpaint.c
M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/blenkernel/intern/gpencil_modifier.c
M	source/blender/blenkernel/intern/idcode.c
M	source/blender/blenkernel/intern/ipo.c
M	source/blender/blenkernel/intern/layer.c
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/library_idmap.c
M	source/blender/blenkernel/intern/modifier.c
M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/particle.c
M	source/blender/blenkernel/intern/sequencer.c
M	source/blender/blenkernel/intern/smoke.c
M	source/blender/blenkernel/intern/softbody.c
M	source/blender/blenkernel/intern/sound.c
M	source/blender/blenkernel/intern/subdiv_ccg.c
M	source/blender/blenkernel/intern/subdiv_foreach.c
M	source/blender/blenkernel/intern/tracking_auto.c
M	source/blender/blenlib/BLI_listbase.h
M	source/blender/blenlib/BLI_math_base.h
M	source/blender/blenlib/BLI_utildefines.h
M	source/blender/blenlib/intern/BLI_memblock.c
M	source/blender/blenlib/intern/BLI_mempool.c
M	source/blender/blenlib/intern/boxpack_2d.c
M	source/blender/blenlib/intern/fileops.c
M	source/blender/blenlib/intern/math_geom.c
M	source/blender/blenlib/intern/string_cursor_utf8.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/blenloader/intern/versioning_250.c
M	source/blender/blenloader/intern/versioning_270.c
M	source/blender/blenloader/intern/versioning_legacy.c
M	source/blender/blentranslation/msgfmt/msgfmt.c
M	source/blender/bmesh/bmesh_class.h
M	source/blender/bmesh/intern/bmesh_interp.c
M	source/blender/bmesh/intern/bmesh_marking.c
M	source/blender/bmesh/intern/bmesh_mods.c
M	source/blender/bmesh/intern/bmesh_operator_api.h
M	source/blender/bmesh/intern/bmesh_polygon_edgenet.c
M	source/blender/bmesh/operators/bmo_bridge.c
M	source/blender/bmesh/operators/bmo_primitive.c
M	source/blender/bmesh/operators/bmo_subdivide_edgering.c
M	source/blender/bmesh/tools/bmesh_bevel.c
M	source/blender/collada/MeshImporter.cpp
M	source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/depsgraph/intern/depsgraph.h
M	source/blender/depsgraph/intern/node/deg_node_id.cc
M	source/blender/draw/engines/eevee/eevee_effects.c
M	source/blender/draw/engines/eevee/eevee_lightprobes.c
M	source/blender/draw/engines/eevee/eevee_lights.c
M	source/blender/draw/engines/eevee/eevee_private.h
M	source/blender/draw/engines/eevee/eevee_render.c
M	source/blender/draw/engines/eevee/eevee_screen_raytrace.c
M	source/blender/draw/engines/eevee/eevee_volumes.c
M	source/blender/draw/engines/eevee/shaders/effect_temporal_aa.glsl
M	source/blender/draw/engines/eevee/shaders/lightprobe_lib.glsl
M	source/blender/draw/engines/eevee/shaders/raytrace_lib.glsl
M	source/blender/draw/engines/eevee/shaders/shadow_copy_frag.glsl
M	source/blender/draw/engines/eevee/shaders/shadow_process_geom.glsl
M	source/blender/draw/engines/eevee/shaders/shadow_process_vert.glsl
M	source/blender/draw/engines/eevee/shaders/shadow_store_frag.glsl
M	source/blender/draw/engines/eevee/shaders/volumetric_frag.glsl
M	source/blender/draw/engines/workbench/shaders/workbench_cavity_frag.glsl
M	source/blender/draw/engines/workbench/shaders/workbench_cavity_lib.glsl
M	source/blender/draw/engines/workbench/workbench_volume.c
M	source/blender/draw/intern/draw_cache_impl_curve.c
M	source/blender/draw/intern/draw_cache_impl_displist.c
M	source/blender/draw/intern/draw_cache_impl_mesh.c
M	source/blender/draw/intern/draw_cache_inline.h
M	source/blender/draw/intern/draw_common.c
M	source/blender/draw/intern/draw_hair.c
M	source/blender/draw/intern/draw_manager.c
M	source/blender/draw/intern/draw_manager.h
M	source/blender/draw/modes/edit_mesh_mode.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/draw/modes/shaders/common_globals_lib.glsl
M	source/blender/draw/modes/shaders/common_hair_lib.glsl
M	source/blender/editors/animation/anim_ipo_utils.c
M	source/blender/editors/armature/pose_edit.c
M	source/blender/editors/armature/pose_slide.c
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/include/ED_keyframes_draw.h
M	source/blender/editors/include/UI_icons.h
M	source/blender/editors/interface/interface_icons.c
M	source/blender/editors/interface/interface_region_hud.c
M	source/blender/editors/object/object_edit.c
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/physics/physics_fluid.c
M	source/blender/editors/render/render_preview.c
M	source/blender/editors/render/render_shading.c
M	source/blender/editors/screen/area.c
M	source/blender/editors/screen/screen_ops.c
M	source/blender/editors/sculpt_paint/paint_image_proj.c
M	source/blender/editors/sculpt_paint/paint_stroke.c
M	source/blender/editors/space_clip/space_clip.c
M	source/blender/editors/space_file/file_draw.c
M	source/blender/editors/space_file/file_ops.c
M	source/blender/editors/space_file/filesel.c
M	source/blender/editors/space_graph/graph_draw.c
M	source/blender/editors/space_info/info_stats.c
M	source/blender/editors/space_view3d/space_view3d.c
M	source/blender/editors/space_view3d/view3d_select.c
M	source/blender/editors/undo/ed_undo.c
M	source/blender/editors/util/select_buffer_utils.c
M	source/blender/freestyle/intern/geometry/GeomCleaner.h
M	source/blender/freestyle/intern/geometry/Grid.cpp
M	source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
M	source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
M	source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
M	source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
M	source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
M	source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
M	source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
M	source/blender/freestyle/intern/stroke/Stroke.h
M	source/blender/freestyle/intern/view_map/Silhouette.h
M	source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
M	source/blender/freestyle/intern/winged_edge/WXEdge.h
M	source/blender/gpu/GPU_framebuffer.h
M	source/blender/ikplugin/intern/itasc_plugin.cpp
M	source/blender/imbuf/intern/dds/ColorBlock.cpp
M	source/blender/imbuf/intern/dds/Stream.h
M	source/blender/imbuf/intern/jp2.c
M	source/blender/makesdna/DNA_constraint_types.h
M	source/blender/makesdna/DNA_customdata_types.h
M	source/blender/makesdna/DNA_lightprobe_types.h
M	source/blender/makesdna/DNA_object_types.h
M	source/blender/makesdna/DNA_scene_types.h
M	source/blender/makesdna/intern/dna_genfile.c
M	source/blender/makesrna/intern/rna_depsgraph.c
M	source/blender/makesrna/intern/rna_image.c
M	source/blender/makesrna/intern/rna_object.c
M	source/blender/makesrna/intern/rna_object_api.c
M	source/blender/makesrna/intern/rna_sequencer.c
M	source/blender/makesrna/intern/rna_tracking.c
M	source/blender/modifiers/intern/MOD_correctivesmooth.c
M	source/blender/modifiers/intern/MOD_datatransfer.c
M	source/blender/nodes/composite/nodes/node_composite_colorSpill.c
M	source/blender/nodes/composite/nodes/node_composite_common.c
M	source/blender/nodes/shader/node_shader_tree.c
M	source/blender/nodes/shader/nodes/node_shader_attribute.c
M	source/blender/nodes/shader/nodes/node_shader_common.c
M	source/blender/physics/intern/BPH_mass_spring.cpp
M	source/blender/python/gpu/gpu_py_batch.c
M	source/blender/python/gpu/gpu_py_vertex_format.c
M	source/blender/python/intern/bpy.c
M	source/blender/python/intern/bpy_props.c
M	source/blender/python/intern/bpy_rna.c
M	source/blender/python/intern/bpy_rna_anim.c
M	source/blender/render/intern/source/pointdensity.c
M	source/blender/windowmanager/intern/wm_keymap.c
M	tests/python/modules/render_report.py

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

diff --git a/.clang-format b/.clang-format
index 6286087c5e3..bbbe3f1bac4 100644
--- a/.clang-format
+++ b/.clang-format
@@ -241,7 +241,7 @@ ForEachMacros:
   - SEQ_BEGIN
   - foreach
 
-# Use once we bump the minimum verison to version 8.
+# Use once we bump the minimum version to version 8.
 # # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
 # StatementMacros:
 #   - PyObject_VAR_HEAD
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0ca98c44a3..88295979fa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -471,7 +471,7 @@ endif()
 option(WITH_OPENGL              "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON)
 option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
 option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
-option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)"                                  OFF)
+option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (through either EGL or the AGL/WGL/XGL 'es20' profile)"                               OFF)
 
 mark_as_advanced(
   WITH_OPENGL
@@ -823,7 +823,7 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}")
     set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}")
     if(WITH_CYCLES_OSL)
-      # With OSL, Cycles disables rtti in some modules, wich then breaks at linking
+      # With OSL, Cycles disables rtti in some modules, which then breaks at linking
       # when trying to use vptr sanitizer (included into 'undefined' general option).
       set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-sanitize=vptr")
       set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-sanitize=vptr")
diff --git a/GNUmakefile b/GNUmakefile
index 1c8602480f3..69a2689cea1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -44,7 +44,7 @@ Convenience Targets
 
 
 Project Files
-   Generate poject files for development environments.
+   Generate project files for development environments.
 
    * project_qtcreator:     QtCreator Project Files.
    * project_netbeans:      NetBeans Project Files.
diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake
index e65f4957094..6806684e88b 100644
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -6,7 +6,7 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
 # There we can not use CPU bitness check since it is always 64bit. So instead
 # we check for a specific libraries.
 #
-# Other builders we are runnign in a bare virtual machine, and the libraries
+# Other builders we are running in a bare virtual machine, and the libraries
 # are installed to /opt/.
 # We assume that only 64bit builders exists in such configuration.
 if(EXISTS "/lib/x86_64-linux-gnu/libc-2.24.so")
diff --git a/intern/cycles/kernel/filter/filter_reconstruction.h b/intern/cycles/kernel/filter/filter_reconstruction.h
index a69397bc6a6..17941689ad5 100644
--- a/intern/cycles/kernel/filter/filter_reconstruction.h
+++ b/intern/cycles/kernel/filter/filter_reconstruction.h
@@ -108,7 +108,7 @@ ccl_device_inline void kernel_filter_finalize(int x,
 
   /* The weighted average of pixel colors (essentially, the NLM-filtered image).
    * In case the solution of the linear model fails due to numerical issues or
-   * returns non-sensical negative values, fall back to this value. */
+   * returns nonsensical negative values, fall back to this value. */
   float3 mean_color = XtWY[0] / XtWX[0];
 
   math_trimatrix_vec3_solve(XtWX, XtWY, (*rank) + 1, stride);
diff --git a/intern/cycles/kernel/svm/svm_ies.h b/intern/cycles/kernel/svm/svm_ies.h
index f13527c03db..e57e54ef123 100644
--- a/intern/cycles/kernel/svm/svm_ies.h
+++ b/intern/cycles/kernel/svm/svm_ies.h
@@ -25,7 +25,7 @@ ccl_device_inline float interpolate_ies_vertical(
    * of v (corresponding to the north pole) would result in artifacts. The proper way of dealing
    * with this would be to lookup the corresponding value on the other side of the pole, but since
    * the horizontal coordinates might be nonuniform, this would require yet another interpolation.
-   * Therefore, the assumtion is made that the light is going to be symmetrical, which means that
+   * Therefore, the assumption is made that the light is going to be symmetrical, which means that
    * we can just take the corresponding value at the current horizontal coordinate. */
 
 #define IES_LOOKUP(v) kernel_tex_fetch(__ies, ofs + h * v_num + (v))
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index a56871779cf..501d1e33a9b 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -978,7 +978,7 @@ void ShaderGraph::bump_from_displacement(bool use_object_space)
   foreach (NodePair &pair, nodes_dy)
     pair.second->bump = SHADER_BUMP_DY;
 
-  /* add set normal node and connect the bump normal ouput to the set normal
+  /* add set normal node and connect the bump normal output to the set normal
    * output, so it can finally set the shader normal, note we are only doing
    * this for bump from displacement, this will be the only bump allowed to
    * overwrite the shader normal */
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 6f927bd5c42..19d27a7ef46 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -152,7 +152,7 @@ void OSLShaderManager::device_update(Device *device,
   {
     /* Perform greedyjit optimization.
      *
-     * This might waste time on optimizing gorups which are never actually
+     * This might waste time on optimizing groups which are never actually
      * used, but this prevents OSL from allocating data on TLS at render
      * time.
      *
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp
index 0cc1b36f369..9073ed9944b 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1435,7 +1435,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
         ////////////////////////////////////////////////////////////////////////
         case WM_NCMOUSEMOVE:
         /* The WM_NCMOUSEMOVE message is posted to a window when the cursor is moved
-         * within the nonclient area of the window. This message is posted to the window that
+         * within the non-client area of the window. This message is posted to the window that
          * contains the cursor. If a window has captured the mouse, this message is not posted.
          */
         case WM_NCHITTEST:
@@ -1602,7 +1602,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
         /* An application sends the WM_NCPAINT message to a window
          * when its frame must be painted. */
         case WM_NCACTIVATE:
-        /* The WM_NCACTIVATE message is sent to a window when its nonclient area needs to be
+        /* The WM_NCACTIVATE message is sent to a window when its non-client area needs to be
          * changed to indicate an active or inactive state. */
         case WM_DESTROY:
         /* The WM_DESTROY message is sent when a window is being destroyed. It is sent to the
@@ -1611,7 +1611,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
          * windows (if any) as they are destroyed. During the processing of the message, it can
          * be assumed that all child windows still exist. */
         case WM_NCDESTROY:
-          /* The WM_NCDESTROY message informs a window that its nonclient area is being
+          /* The WM_NCDESTROY message informs a window that its non-client area is being
            * destroyed. The DestroyWindow function sends the WM_NCDESTROY message to the window
            * following the WM_DESTROY message. WM_DESTROY is used to free the allocated memory
            * object associated with the window.
diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py
index 152dab23dcf..034aa9fff6c 100644
--- a/release/scripts/startup/bl_operators/userpref.py
+++ b/release/scripts/startup/bl_operators/userpref.py
@@ -93,7 +93,7 @@ class PREFERENCES_OT_copy_prev(Operator):
         old = cls._old_path()
         new = cls._new_path()
 
-        # Disable operator in case config path is overriden with environment
+        # Disable operator in case config path is overridden with environment
         # variable. That case has no automatic per-version configuration.
         userconfig_path = os.path.normpath(bpy.utils.user_resource('CONFIG'))
         new_userconfig_path = os.path.normpath(os.path.join(new, "config"))
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index e51c965a243..d63b310fef7 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -780,7 +780,7 @@ static void import_endjob(void *user_data)
 
   std::vector<AbcObjectReader *>::iterator iter;
 
-  /* Delete objects on cancelation. */
+  /* Delete objects on cancellation. */
   if (data->was_cancelled) {
     for (iter = data->readers.begin(); iter != data->readers.end(); ++iter) {
       Object *ob = (*iter)->object();
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index c2fcb99a3be..26a2018f015 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -330,7 +330,7 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag)
 /**
  * \param flag: Control ID pointers management,
  * see LIB_ID_CREATE_.../LIB_ID_COPY_... flags in BKE_library.h
- * \return true 

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list