diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-21 15:37:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-21 15:37:51 +0400 |
| commit | 3d1cdfbb3833f2869dc73fb18b3305e78ab608db (patch) | |
| tree | 60dc6da4978b4f9e696065e542c2e8a44a763bfb /source/blender/makesdna | |
| parent | f9467d28b99a620631ed1c2d249532b2dba46f67 (diff) | |
remove sticky coords from blender and the internal render engine.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_customdata_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 2 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_meshdata_types.h | 6 |
3 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h index 377af042922..c22de3cb7eb 100644 --- a/source/blender/makesdna/DNA_customdata_types.h +++ b/source/blender/makesdna/DNA_customdata_types.h @@ -74,7 +74,7 @@ typedef struct CustomData { /* CustomData.type */ #define CD_MVERT 0 -#define CD_MSTICKY 1 +#define CD_MSTICKY 1 /* DEPRECATED */ #define CD_MDEFORMVERT 2 #define CD_MEDGE 3 #define CD_MFACE 4 @@ -118,7 +118,7 @@ typedef struct CustomData { /* Bits for CustomDataMask */ #define CD_MASK_MVERT (1 << CD_MVERT) -#define CD_MASK_MSTICKY (1 << CD_MSTICKY) +#define CD_MASK_MSTICKY (1 << CD_MSTICKY) /* DEPRECATED */ #define CD_MASK_MDEFORMVERT (1 << CD_MDEFORMVERT) #define CD_MASK_MEDGE (1 << CD_MEDGE) #define CD_MASK_MFACE (1 << CD_MFACE) diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index af300e3d615..d33f76892b9 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -339,7 +339,7 @@ typedef struct Material { #define TEXCO_OBJECT 32 #define TEXCO_LAVECTOR 64 #define TEXCO_VIEW 128 -#define TEXCO_STICKY 256 // DEPRECATED +#define TEXCO_STICKY_ 256 // DEPRECATED #define TEXCO_OSA 512 #define TEXCO_WINDOW 1024 #define NEED_UV 2048 diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h index 54e1e762f8b..7040bc72f18 100644 --- a/source/blender/makesdna/DNA_meshdata_types.h +++ b/source/blender/makesdna/DNA_meshdata_types.h @@ -146,13 +146,9 @@ typedef struct MLoopCol { mcol__tmp->a = mloopcol__tmp->a; \ } (void)0 -typedef struct MSticky { - float co[2]; -} MSticky; - typedef struct MSelect { int index; - int type; /* EDITVERT/EDITEDGE/EDITFACE */ + int type; /* ME_VSEL/ME_ESEL/ME_FSEL */ } MSelect; /*tessellation uv face data*/ |