Merge remote-tracking branch 'origin/master' into lanpr-under-gp

3 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index ac747ab3037..df1626157b0 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -943,7 +943,7 @@ static bool elem_exists_alias(const SDNA *sdna,
 }
 
 /**
- * Return the offset in bytes or -1 on failure to find the struct member with it's expected type.
+ * Return the offset in bytes or -1 on failure to find the struct member with its expected type.
  *
  * \param sdna: Old #SDNA.
  * \param type: Current field type name.
@@ -1774,7 +1774,7 @@ bool DNA_sdna_patch_struct_member(SDNA *sdna,
 
 /**
  * Names are shared between structs which causes problems renaming.
- * Make sure every struct member gets it's own name so renaming only ever impacts a single struct.
+ * Make sure every struct member gets its own name so renaming only ever impacts a single struct.
  *
  * The resulting SDNA is never written to disk.
  */
diff --git a/source/blender/makesdna/intern/dna_rename_defs.h b/source/blender/makesdna/intern/dna_rename_defs.h
index a0e983e7d3b..7067caa60d9 100644
--- a/source/blender/makesdna/intern/dna_rename_defs.h
+++ b/source/blender/makesdna/intern/dna_rename_defs.h
@@ -24,7 +24,7 @@
  * Defines in this header are only used to define blend file storage.
  * This allows us to rename variables & structs without breaking compatibility.
  *
- * - When renaming the member of a struct which has it's self been renamed
+ * - When renaming the member of a struct which has itself been renamed
  *   refer to the newer name, not the original.
  *
  * - Changes here only change generated code for `makesdna.c` and `makesrna.c`
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index a5132486202..7e54182c1b5 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -508,7 +508,7 @@ static int add_name(const char *str)
       buf[i + 2] = ')';
       buf[i + 3] = 0;
     }
-    /* now precede with buf*/
+    /* now proceed with buf*/
     DEBUG_PRINTF(3, "\t\t\t\t\tProposing fp name %s\n", buf);
     name = buf;
   }