Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-17 20:10:45 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-17 20:54:35 +0300
commit54a9136569d975db1e894dca8291fc048f91049d (patch)
treee84204cc83e1ddbb8f0acde1ad71f31444a22759
parentb46c707ec23e99dd06f22fef6b6f493cd6cdb4f1 (diff)
RNA: move enums to rna_rna.c
Needed for use in rna non runtime code.
-rw-r--r--source/blender/makesrna/intern/rna_access.c11
-rw-r--r--source/blender/makesrna/intern/rna_rna.c24
2 files changed, 24 insertions, 11 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 6ef14b06397..a6a834465ff 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1408,17 +1408,6 @@ int RNA_property_pointer_poll(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *va
return 0;
}
-/* Reuse for dynamic types */
-const EnumPropertyItem DummyRNA_NULL_items[] = {
- {0, NULL, 0, NULL, NULL}
-};
-
-/* Reuse for dynamic types with default value */
-const EnumPropertyItem DummyRNA_DEFAULT_items[] = {
- {0, "DEFAULT", 0, "Default", ""},
- {0, NULL, 0, NULL, NULL}
-};
-
void RNA_property_enum_items_ex(
bContext *C, PointerRNA *ptr, PropertyRNA *prop, const bool use_static,
const EnumPropertyItem **r_item, int *r_totitem, bool *r_free)
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 234676379ee..f42bc1e1923 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -36,6 +36,28 @@
#include "rna_internal.h"
+/* -------------------------------------------------------------------- */
+/** \name Generic Enum's
+ * \{ */
+
+/* Reuse for dynamic types */
+const EnumPropertyItem DummyRNA_NULL_items[] = {
+ {0, NULL, 0, NULL, NULL}
+};
+
+/* Reuse for dynamic types with default value */
+const EnumPropertyItem DummyRNA_DEFAULT_items[] = {
+ {0, "DEFAULT", 0, "Default", ""},
+ {0, NULL, 0, NULL, NULL}
+};
+
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name RNA Enum's
+ * \{ */
+
+
const EnumPropertyItem rna_enum_property_type_items[] = {
{PROP_BOOLEAN, "BOOLEAN", 0, "Boolean", ""},
{PROP_INT, "INT", 0, "Integer", ""},
@@ -103,6 +125,8 @@ const EnumPropertyItem rna_enum_property_unit_items[] = {
{0, NULL, 0, NULL, NULL}
};
+/** \} */
+
#ifdef RNA_RUNTIME
#include "MEM_guardedalloc.h"
#include "BLI_ghash.h"