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>2015-11-18 04:23:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-18 04:23:05 +0300
commit3555ef184b3201afcecf610ee37694081ac5ee2c (patch)
treecef1979585e9191a1634d54ff806ff5916832274 /source/blender/makesrna/intern/rna_object_force.c
parenta374ff16b5e823ae37b69eb1995d36944b80c57f (diff)
RNA: reuse axis enum
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_force.c')
-rw-r--r--source/blender/makesrna/intern/rna_object_force.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index f7cc4187dc6..0841a19dcee 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -34,6 +34,7 @@
#include "DNA_smoke_types.h"
#include "RNA_define.h"
+#include "RNA_enum_types.h"
#include "rna_internal.h"
@@ -1169,13 +1170,6 @@ static void rna_def_field(BlenderRNA *brna)
{6, "ROLL", 0, "Roll", ""},
{0, NULL, 0, NULL, NULL}
};
-
- static EnumPropertyItem guide_kink_axis_items[] = {
- {0, "X", 0, "X", ""},
- {1, "Y", 0, "Y", ""},
- {2, "Z", 0, "Z", ""},
- {0, NULL, 0, NULL, NULL}
- };
srna = RNA_def_struct(brna, "FieldSettings", NULL);
RNA_def_struct_sdna(srna, "PartDeflect");
@@ -1456,7 +1450,7 @@ static void rna_def_field(BlenderRNA *brna)
prop = RNA_def_property(srna, "guide_kink_axis", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "kink_axis");
- RNA_def_property_enum_items(prop, guide_kink_axis_items);
+ RNA_def_property_enum_items(prop, object_axis_unsigned_items);
RNA_def_property_ui_text(prop, "Axis", "Which axis to use for offset");
RNA_def_property_update(prop, 0, "rna_FieldSettings_update");