[Bf-blender-cvs] [3cf2ad0f753] temp-dna-rename: Correct mistakes, also simplify names

Campbell Barton noreply at git.blender.org
Tue Feb 12 22:11:36 CET 2019


Commit: 3cf2ad0f753cc88ea7f1fae99d2668499b85ba89
Author: Campbell Barton
Date:   Wed Feb 13 07:48:25 2019 +1100
Branches: temp-dna-rename
https://developer.blender.org/rB3cf2ad0f753cc88ea7f1fae99d2668499b85ba89

Correct mistakes, also simplify names

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

M	source/blender/makesdna/intern/makesdna.c
M	source/blender/makesrna/intern/rna_define.c

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

diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index e2b1d6f3ee0..d3cde8f95c3 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -162,8 +162,6 @@ static short **structs, *structdata;
 static struct {
 	GHash *struct_map_runtime_from_static;
 	GHash *struct_map_static_from_runtime;
-
-	GHash *elem_map_runtime_from_static;
 	GHash *elem_map_static_from_runtime;
 } g_version_data = {NULL};
 
@@ -265,12 +263,12 @@ static const char *version_struct_runtime_from_static(const char *str)
 	return str;
 }
 
-static const char *version_struct_elem_runtime_from_static(
-        const int strct, const char *elem_static_untrimmed)
+static const char *version_elem_runtime_from_static(
+        const int strct, const char *elem_static_full)
 {
 	/* First get the old name with everything stripped out of it. */
-	const uint elem_static_offset_start = DNA_elem_id_offset_start(elem_static_untrimmed);
-	const char *elem_static_trim = elem_static_untrimmed + elem_static_offset_start;
+	const uint elem_static_offset_start = DNA_elem_id_offset_start(elem_static_full);
+	const char *elem_static_trim = elem_static_full + elem_static_offset_start;
 	const uint elem_static_len = DNA_elem_id_offset_end(elem_static_trim);
 
 	char *elem_static = alloca(elem_static_len + 1);
@@ -288,7 +286,7 @@ static const char *version_struct_elem_runtime_from_static(
 		        elem_static, elem_static_len,
 		        elem_static_offset_start);
 	}
-	return elem_static_untrimmed;
+	return elem_static_full;
 }
 
 static int add_type(const char *str, int len)
@@ -727,9 +725,7 @@ static int convert_include(const char *filename)
 									if (md1[slen - 1] == ';') {
 										md1[slen - 1] = 0;
 
-										const char *md1_maybe_versioned = version_struct_elem_runtime_from_static(strct, md1);
-
-										name = add_name(md1_maybe_versioned);
+										name = add_name(version_elem_runtime_from_static(strct, md1));
 										slen += additional_slen_offset;
 										sp[0] = type;
 										sp[1] = name;
@@ -745,9 +741,7 @@ static int convert_include(const char *filename)
 										break;
 									}
 
-									const char *md1_maybe_versioned = version_struct_elem_runtime_from_static(strct, md1);
-
-									name = add_name(md1_maybe_versioned);
+									name = add_name(version_elem_runtime_from_static(strct, md1));
 									slen += additional_slen_offset;
 
 									sp[0] = type;
@@ -1065,7 +1059,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
 	DNA_softupdate_maps(
 	        DNA_VERSION_RUNTIME_FROM_STATIC,
 	        &g_version_data.struct_map_runtime_from_static,
-	        &g_version_data.elem_map_runtime_from_static);
+	        NULL);
 	DNA_softupdate_maps(
 	        DNA_VERSION_STATIC_FROM_RUNTIME,
 	        &g_version_data.struct_map_static_from_runtime,
@@ -1271,8 +1265,6 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs
 
 	BLI_ghash_free(g_version_data.struct_map_runtime_from_static, NULL, NULL);
 	BLI_ghash_free(g_version_data.struct_map_static_from_runtime, NULL, NULL);
-
-	BLI_ghash_free(g_version_data.elem_map_runtime_from_static, MEM_freeN, NULL);
 	BLI_ghash_free(g_version_data.elem_map_static_from_runtime, MEM_freeN, NULL);
 
 	DEBUG_PRINTF(0, "done.\n");
diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c
index 10175115d68..c59097b40b3 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -362,14 +362,16 @@ static int rna_find_sdna_member(SDNA *sdna, const char *structname, const char *
 
 	if (!DefRNA.preprocess) {
 		fprintf(stderr, "%s: only during preprocessing.\n", __func__);
-		return;
+		return 0;
 	}
 
+#ifndef RNA_RUNTIME
 	{
 		const char *structname_maybe_static = BLI_ghash_lookup_default(
 		        g_version_data.struct_map_static_from_runtime, structname, (void *)structname);
 		structnr = DNA_struct_find_nr(sdna, structname_maybe_static);
 	}
+#endif
 
 	if (structnr == -1)
 		return 0;



More information about the Bf-blender-cvs mailing list