diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-30 01:28:18 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-30 01:28:18 +0400 |
| commit | 29f214f7f31bf7490b0c2795ad716ce5a9dc1818 (patch) | |
| tree | fa9cb969c253e58c71c0dd61e89731f185849030 /source/blender/makesdna | |
| parent | ce1c78e18bf41115a8a149dd85115292c1919bea (diff) | |
| parent | 6a27da310c61b3372d565060506221a5afb9fe43 (diff) | |
Merging up to trunk r38834.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_modifier_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index d2d8e014015..3787675f339 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -624,6 +624,7 @@ typedef struct MultiresModifierData { typedef enum { eMultiresModifierFlag_ControlEdges = (1<<0), + eMultiresModifierFlag_PlainUv = (1<<1), } MultiresModifierFlag; typedef struct FluidsimModifierData { diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index b39f0a68854..7a5d417b59c 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1078,7 +1078,7 @@ typedef struct Scene { #define SCE_SNAP_ROTATE 2 #define SCE_SNAP_PEEL_OBJECT 4 #define SCE_SNAP_PROJECT 8 -#define SCE_SNAP_PROJECT_NO_SELF 16 +#define SCE_SNAP_NO_SELF 16 /* toolsettings->snap_target */ #define SCE_SNAP_TARGET_CLOSEST 0 #define SCE_SNAP_TARGET_CENTER 1 |