diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-21 15:19:16 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-21 15:19:16 +0400 |
| commit | f9467d28b99a620631ed1c2d249532b2dba46f67 (patch) | |
| tree | d6b16f77679766ee8fe69094c88f9234fe6dad2a /source/blender/makesdna | |
| parent | fd44038ed754f58ddfe48228bfb5fa41ea367e65 (diff) | |
remove sticky coordinates from blender, this was missing from the UI since 2.49.
TODO - drop support from the renderer still.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 4 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index 940c5c5f30b..af300e3d615 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -140,6 +140,8 @@ typedef struct Material { float param[4]; /* size, smooth, size, smooth, for toonshader, 0 (fac) and 1 (fresnel) also for fresnel shader */ float rms; float darkness; + + /* runtime - OR'd from 'mtex' */ short texco, mapto; /* ramp colors */ @@ -337,7 +339,7 @@ typedef struct Material { #define TEXCO_OBJECT 32 #define TEXCO_LAVECTOR 64 #define TEXCO_VIEW 128 -#define TEXCO_STICKY 256 +#define TEXCO_STICKY 256 // DEPRECATED #define TEXCO_OSA 512 #define TEXCO_WINDOW 1024 #define NEED_UV 2048 diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index e584cfd76ac..c7f90eea176 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -89,8 +89,7 @@ typedef struct Mesh { /* array of colors for the tessellated faces, must be number of tessellated * faces * 4 in length */ - struct MCol *mcol; - struct MSticky *msticky; + struct MCol *mcol; struct Mesh *texcomesh; /* When the object is available, the preferred access method is: BMEdit_FromObject(ob) */ |