Merge branch 'master' into greasepencil-edit-curve

3 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 7b63a4154fa..b2794e9d9d6 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -338,7 +338,7 @@ typedef struct SculptBoundary {
   int num_vertices;
 
   /* Distance from a vertex in the boundary to initial vertex indexed by vertex index, taking into
-   * account the lengh of all edges between them. Any vertex that is not in the boundary will have
+   * account the length of all edges between them. Any vertex that is not in the boundary will have
    * a distance of 0. */
   float *distance;
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index ada341ff570..6f32eb8a90f 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -36,8 +36,8 @@ set(INC
   ../makesrna
   ../modifiers
   ../nodes
-  ../simulation
   ../shader_fx
+  ../simulation
   ../render/extern/include
   ../../../intern/ghost
   ../../../intern/glew-mx
@@ -365,8 +365,8 @@ set(SRC
   BKE_packedFile.h
   BKE_paint.h
   BKE_particle.h
-  BKE_persistent_data_handle.hh
   BKE_pbvh.h
+  BKE_persistent_data_handle.hh
   BKE_pointcache.h
   BKE_pointcloud.h
   BKE_report.h
@@ -440,9 +440,9 @@ set(LIB
   bf_intern_opensubdiv  # Uses stub when disabled.
   bf_modifiers
   bf_nodes
-  bf_simulation
   bf_rna
   bf_shader_fx
+  bf_simulation
 )
 
 if(WITH_BINRELOC)
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 047f927ae88..e5a9ee53054 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -6032,7 +6032,7 @@ void BKE_constraints_solve(struct Depsgraph *depsgraph,
      */
     enf = con->enforce;
 
-    /* make copy of worldspace matrix pre-constraint for use with blending later */
+    /* make copy of world-space matrix pre-constraint for use with blending later */
     copy_m4_m4(oldmat, cob->matrix);
 
     /* move owner matrix into right space */
@@ -6053,16 +6053,16 @@ void BKE_constraints_solve(struct Depsgraph *depsgraph,
       cti->flush_constraint_targets(con, &targets, 1);
     }
 
-    /* move owner back into worldspace for next constraint/other business */
+    /* move owner back into world-space for next constraint/other business */
     if ((con->flag & CONSTRAINT_SPACEONCE) == 0) {
       BKE_constraint_mat_convertspace(
           cob->ob, cob->pchan, cob->matrix, con->ownspace, CONSTRAINT_SPACE_WORLD, false);
     }
 
     /* Interpolate the enforcement, to blend result of constraint into final owner transform
-     * - all this happens in worldspace to prevent any weirdness creeping in
+     * - all this happens in world-space to prevent any weirdness creeping in
      *   (T26014 and T25725), since some constraints may not convert the solution back to the input
-     *   space before blending but all are guaranteed to end up in good "worldspace" result.
+     *   space before blending but all are guaranteed to end up in good "world-space" result.
      */
     /* Note: all kind of stuff here before (caused trouble), much easier to just interpolate,
      * or did I miss something? -jahka (r.32105) */