[Bf-blender-cvs] [d76db3deedd] temp-dna-rename: Use RNA ifdef's

[Campbell Barton]

Commit: d76db3deedd9f1bc21059ba342c2dac958a1a459
Author: Campbell Barton
Date:   Wed Feb 13 01:12:05 2019 +1100
Branches: temp-dna-rename
https://developer.blender.org/rBd76db3deedd9f1bc21059ba342c2dac958a1a459

Use RNA ifdef's

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

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 ef455eb3688..69b451212be 100644
--- a/source/blender/makesrna/intern/rna_define.c
+++ b/source/blender/makesrna/intern/rna_define.c
@@ -58,12 +58,12 @@
 
 BlenderDefRNA DefRNA = {NULL, {NULL, NULL}, {NULL, NULL}, NULL, 0, 0, 0, 1, 1};
 
+#ifndef RNA_RUNTIME
 static struct {
        char _dont_leave_me_empty;
-// #ifndef RNA_RUNTIME
        GHash *struct_map_static_from_runtime;
-// #endif
 } g_version_data;
+#endif
 
 /* Duplicated code since we can't link in blenkernel or blenlib */
 
@@ -365,12 +365,13 @@ static int rna_find_sdna_member(SDNA *sdna, const char 
*structname, const char *
         * at 'RNA_RUNTIME', or disable this function at runtime. */
 #ifdef RNA_RUNTIME
        BLI_assert(0);
-#endif
+#else
        {
                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
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs