archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: make DNA_struct_find_nr_ex function more compact

Browse Source
This commit is contained in:
Campbell Barton
2019-05-21 17:42:58 +10:00
parent 1f51584167
commit 34d7ff76ee
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/makesdna/intern/dna_genfile.c
View File

@@ -224,47 +224,34 @@ static void printstruct(SDNA *sdna, short strnr)
*/ */
int DNA_struct_find_nr_ex(const SDNA *sdna, const char *str, unsigned int *index_last) int DNA_struct_find_nr_ex(const SDNA *sdna, const char *str, unsigned int *index_last)
{ {
const short *sp = NULL;
if (*index_last < sdna->nr_structs) { if (*index_last < sdna->nr_structs) {
sp = sdna->structs[*index_last]; const short *sp = sdna->structs[*index_last];
if (strcmp(sdna->types[sp[0]], str) == 0) { if (STREQ(sdna->types[sp[0]], str)) {
return *index_last; return *index_last;
} }
} }
#ifdef WITH_DNA_GHASH #ifdef WITH_DNA_GHASH
{ {
void **index_p; void **index_p = BLI_ghash_lookup_p(sdna->structs_map, str);
int a;
index_p = BLI_ghash_lookup_p(sdna->structs_map, str);
if (index_p) { if (index_p) {
a = POINTER_AS_INT(*index_p); const int index = POINTER_AS_INT(*index_p);
*index_last = a; *index_last = index;
return index;
} }
else {
a = -1;
}
return a;
} }
#else #else
{ {
int a; for (int index = 0; index < sdna->nr_structs; index++) {
const short *sp = sdna->structs[index];
for (a = 0; a < sdna->nr_structs; a++) { if (STREQ(sdna->types[sp[0]], str)) {
*index_last = index;
sp = sdna->structs[a]; return index;
if (strcmp(sdna->types[sp[0]], str) == 0) {
*index_last = a;
return a;
} }
} }
} }
return -1;
#endif #endif
return -1;
} }
int DNA_struct_find_nr(const SDNA *sdna, const char *str) int DNA_struct_find_nr(const SDNA *sdna, const char *str)