Commit: 97c3005ec99a7c5beacc94fbaf296d4ed64bdfbd
Author: Campbell Barton
Date: Wed Feb 13 01:21:09 2019 +1100
Branches: temp-dna-rename
https://developer.blender.org/rB97c3005ec99a7c5beacc94fbaf296d4ed64bdfbd
Remove TODO
===================================================================
M source/blender/makesrna/intern/rna_define.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_define.c
b/source/blender/makesrna/intern/rna_define.c
index 69b451212be..10175115d68 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -60,7 +60,6 @@ BlenderDefRNA DefRNA = {NULL, {NULL, NULL}, {NULL, NULL},
NULL, 0, 0, 0, 1, 1};
#ifndef RNA_RUNTIME
static struct {
- char _dont_leave_me_empty;
GHash *struct_map_static_from_runtime;
} g_version_data;
#endif
@@ -361,17 +360,16 @@ static int rna_find_sdna_member(SDNA *sdna, const char
*structname, const char *
const short *sp;
int a, b, structnr, totmember, cmp;
- /* TODO: (campbell) either support this by allocating
'struct_map_static_from_runtime'
- * at 'RNA_RUNTIME', or disable this function at runtime. */
-#ifdef RNA_RUNTIME
- BLI_assert(0);
-#else
+ if (!DefRNA.preprocess) {
+ fprintf(stderr, "%s: only during preprocessing.\n", __func__);
+ return;
+ }
+
{
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;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
