[Bf-blender-cvs] [7506e19220a] temp-dna-rename: Naming

[Campbell Barton]

Commit: 7506e19220afc8a423df99bee6e7983cf1f828dc
Author: Campbell Barton
Date:   Wed Feb 13 10:47:18 2019 +1100
Branches: temp-dna-rename
https://developer.blender.org/rB7506e19220afc8a423df99bee6e7983cf1f828dc

Naming

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

M	source/blender/makesdna/intern/dna_genfile.c
M	source/blender/makesdna/intern/dna_utils.h

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

diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c
index cc1f771df02..51b364d43e2 100644
--- a/source/blender/makesdna/intern/dna_genfile.c
+++ b/source/blender/makesdna/intern/dna_genfile.c
@@ -1408,22 +1408,22 @@ static bool DNA_sdna_patch_struct_member_nr(
 	BLI_assert(member_new != NULL);
 	const short *sp = sdna->structs[struct_name_nr];
 	for (int member_iter = sp[1]; member_iter > 0; member_iter--, sp += 2) {
-		const char *member_dna_old = sdna->names[sp[1]];
-		/* Start & end offsets in 'member_dna_old'. */
-		uint member_dna_offset_start;
-		if (DNA_elem_id_match(member_old, member_old_len, member_dna_old, &member_dna_offset_start)) {
+		const char *elem_full_old = sdna->names[sp[1]];
+		/* Start & end offsets in 'elem_full_old'. */
+		uint elem_full_offset_start;
+		if (DNA_elem_id_match(member_old, member_old_len, elem_full_old, &elem_full_offset_start)) {
 			if (sdna->mem_arena == NULL) {
 				sdna->mem_arena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
 			}
-			const int member_dna_old_len = strlen(member_dna_old);
-			const char *member_dna_new = DNA_elem_id_rename(
+			const int elem_full_old_len = strlen(elem_full_old);
+			const char *elem_full_new = DNA_elem_id_rename(
 			        sdna->mem_arena,
 			        member_old, member_old_len,
 			        member_new, member_new_len,
-			        member_dna_old, member_dna_old_len,
-			        member_dna_offset_start);
+			        elem_full_old, elem_full_old_len,
+			        elem_full_offset_start);
 
-			sdna->names[sp[1]] = member_dna_new;
+			sdna->names[sp[1]] = elem_full_new;
 			return true;
 		}
 	}
@@ -1523,10 +1523,10 @@ void DNA_sdna_softpatch_runtime_ensure(SDNA *sdna)
 				const char *elem_static = sdna->names[sp[1]];
 				const uint elem_static_offset_start = DNA_elem_id_offset_start(elem_static);
 				const char *elem_static_trim = elem_static + elem_static_offset_start;
-				const uint member_dna_offset_end = (
+				const uint elem_full_offset_end = (
 				        elem_static_offset_start + DNA_elem_id_offset_end(elem_static_trim));
 
-				const uint elem_static_buf_len = member_dna_offset_end - elem_static_offset_start;
+				const uint elem_static_buf_len = elem_full_offset_end - elem_static_offset_start;
 				char elem_static_buf[1024];
 				strncpy(elem_static_buf, elem_static_trim, elem_static_buf_len);
 				elem_static_buf[elem_static_buf_len] = '\0';
diff --git a/source/blender/makesdna/intern/dna_utils.h b/source/blender/makesdna/intern/dna_utils.h
index 57beddaed4f..0c0e795cda8 100644
--- a/source/blender/makesdna/intern/dna_utils.h
+++ b/source/blender/makesdna/intern/dna_utils.h
@@ -25,19 +25,19 @@ struct GHash;
 
 int DNA_elem_array_size(const char *str);
 
-uint DNA_elem_id_offset_start(const char *elem_dna);
-uint DNA_elem_id_offset_end(const char *elem_dna);
+uint DNA_elem_id_offset_start(const char *elem_full);
+uint DNA_elem_id_offset_end(const char *elem_full);
 void DNA_elem_id_strip(char *elem_dst, const char *elem_src);
 bool DNA_elem_id_match(
         const char *elem_search, const int elem_search_len,
-        const char *elem_dna,
-        uint *r_elem_dna_offset);
+        const char *elem_full,
+        uint *r_elem_full_offset);
 char *DNA_elem_id_rename(
         struct MemArena *mem_arena,
         const char *elem_src, const int elem_src_len,
         const char *elem_dst, const int elem_dst_len,
-        const char *elem_dna_src, const int elem_dna_src_len,
-        const uint elem_dna_offset_start);
+        const char *elem_full_src, const int elem_full_src_len,
+        const uint elem_full_offset_start);
 
 /* When requesting version info, support both directions. */
 enum eDNAVersionDir {