Merge remote-tracking branch 'origin/master' into blender2.8

[blender.git] / source / blender / makesrna / intern / rna_modifier.c

diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 6cd9fe8f525e5d64d830b513190bc3a4c84809ce..de5dd2b2b56629f06ef395d91c1793e856333af2 100644 (file)
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2080,6 +2080,12 @@ static void rna_def_modifier_displace(BlenderRNA *brna)
                {0, NULL, 0, NULL, NULL}
        };
 
+       static EnumPropertyItem prop_space_items[] = {
+               {MOD_DISP_SPACE_LOCAL, "LOCAL", 0, "Local", "Direction is defined in local coordinates"},
+               {MOD_DISP_SPACE_GLOBAL, "GLOBAL", 0, "Global", "Direction is defined in global coordinates"},
+               {0, NULL, 0, NULL, NULL}
+       };
+
        srna = RNA_def_struct(brna, "DisplaceModifier", "Modifier");
        RNA_def_struct_ui_text(srna, "Displace Modifier", "Displacement modifier");
        RNA_def_struct_sdna(srna, "DisplaceModifierData");
@@ -2110,6 +2116,11 @@ static void rna_def_modifier_displace(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Direction", "");
        RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
+       prop = RNA_def_property(srna, "space", PROP_ENUM, PROP_NONE);
+       RNA_def_property_enum_items(prop, prop_space_items);
+       RNA_def_property_ui_text(prop, "Space", "");
+       RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
+
        rna_def_modifier_generic_map_info(srna);
 }