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

[blender.git] / source / blender / makesdna / DNA_modifier_types.h

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 87321e9fd9340fd13553b2c722701154fc945ca9..7872ee0925961345a7e64074c2a74e426ada1beb 100644 (file)
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -383,7 +383,7 @@ typedef struct DisplaceModifierData {
        int direction;
        char defgrp_name[64];   /* MAX_VGROUP_NAME */
        float midlevel;
-       int pad;
+       int space;
 } DisplaceModifierData;
 
 /* DisplaceModifierData->direction */
@@ -404,6 +404,12 @@ enum {
        MOD_DISP_MAP_UV     = 3,
 };
 
+/* DisplaceModifierData->space */
+enum {
+       MOD_DISP_SPACE_LOCAL  = 0,
+       MOD_DISP_SPACE_GLOBAL = 1,
+};
+
 typedef struct UVProjectModifierData {
        ModifierData modifier;