Remove Blender Internal and legacy viewport from Blender 2.8.

Brecht authored this commit, but he gave me the honours to actually
do it. Here it goes; Blender Internal. Bye bye, you did great!

* Point density, voxel data, ocean, environment map textures were removed,
  as these only worked within BI rendering. Note that the ocean modifier
  and the Cycles point density shader node continue to work.
* Dynamic paint using material shading was removed, as this only worked
  with BI. If we ever wanted to support this again probably it should go
  through the baking API.
* GPU shader export through the Python API was removed. This only worked
  for the old BI GLSL shaders, which no longer exists. Doing something
  similar for Eevee would be significantly more complicated because it
  uses a lot of multiplass rendering and logic outside the shader, it's
  probably impractical.
* Collada material import / export code is mostly gone, as it only worked
  for BI materials. We need to add Cycles / Eevee material support at some
  point.
* The mesh noise operator was removed since it only worked with BI
  material texture slots. A displacement modifier can be used instead.
* The delete texture paint slot operator was removed since it only worked
  for BI material texture slots. Could be added back with node support.

* Not all legacy viewport features are supported in the new viewport, but
  their code was removed. If we need to bring anything back we can look at
  older git revisions.
* There is some legacy viewport code that I could not remove yet, and some
  that I probably missed.
* Shader node execution code was left mostly intact, even though it is not
  used anywhere now. We may eventually use this to replace the texture
  nodes with Cycles / Eevee shader nodes.

* The Cycles Bake panel now includes settings for baking multires normal
  and displacement maps. The underlying code needs to be merged properly,
  and we plan to add back support for multires AO baking and add support
  to Cycles baking for features like vertex color, displacement, and other
  missing baking features.

* This commit removes DNA and the Python API for BI material, lamp, world
  and scene settings. This breaks a lot of addons.
* There is more DNA that can be removed or renamed, where Cycles or Eevee
  are reusing some old BI properties but the names are not really correct
  anymore.
* Texture slots for materials, lamps and world were removed. They remain
  for brushes, particles and freestyle linestyles.
* 'BLENDER_RENDER' remains in the COMPAT_ENGINES of UI panels. Cycles and
  other renderers use this to find all panels to show, minus a few panels
  that they have their own replacement for.

10 files changed, 83 insertions, 692 deletions

diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index 17553e98817..ecdcb2398ac 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -177,7 +177,7 @@ typedef struct DynamicPaintCanvasSettings {
 /* flags */
 enum {
 	MOD_DPAINT_PART_RAD           = 1 << 0,  /* use particle radius */
-	MOD_DPAINT_USE_MATERIAL       = 1 << 1,  /* use object material */
+	//MOD_DPAINT_USE_MATERIAL       = 1 << 1,  /* DNA_DEPRECATED */
 	MOD_DPAINT_ABS_ALPHA          = 1 << 2,  /* don't increase alpha unless paint alpha is higher than existing */
 	MOD_DPAINT_ERASE              = 1 << 3,  /* removes paint */
 
@@ -231,7 +231,6 @@ typedef struct DynamicPaintBrushSettings {
 	struct DynamicPaintModifierData *pmd; /* for fast RNA access */
 	struct DerivedMesh *dm;
 	struct ParticleSystem *psys;
-	struct Material *mat;
 
 	int flags;
 	int collision;
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 92703fa2d3b..68453e5f189 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -67,42 +67,17 @@ typedef struct Lamp {
 	short pad2;
 	
 	float clipsta, clipend;
-	float bias, soft, compressthresh, bleedbias, bleedexp;
+	float bias, soft, bleedbias, bleedexp;
 	short bufsize, samp, buffers, filtertype;
 	char bufflag, buftype;
 	
-	short ray_samp, ray_sampy, ray_sampz;
-	short ray_samp_type;
 	short area_shape;
 	float area_size, area_sizey, area_sizez;
-	float adapt_thresh;
-	short ray_samp_method;
-	short shadowmap_type;
 	
 	/* texact is for buttons */
 	short texact, shadhalostep;
 	
-	/* sun/sky */
-	short sun_effect_type;
-	short skyblendtype;
-	float horizon_brightness;
-	float spread;
-	float sun_brightness;
-	float sun_size;
-	float backscattered_light;
-	float sun_intensity;
-	float atm_turbidity;
-	float atm_inscattering_factor;
-	float atm_extinction_factor;
-	float atm_distance_factor;
-	float skyblendfac;
-	float sky_exposure;
-	float shadow_frustum_size;		/* BGE Only */
-	short sky_colorspace;
-	char pad4[2];
-
 	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
-	struct MTex *mtex[18];			/* MAX_MTEX */
 	short pr_texture, use_nodes;
 	char pad6[4];
 
@@ -139,37 +114,28 @@ typedef struct Lamp {
 
 /* mode */
 #define LA_SHAD_BUF		(1 << 0)
-#define LA_HALO			(1 << 1)
-#define LA_LAYER		(1 << 2)
-#define LA_QUAD			(1 << 3) /* no longer used */
-#define LA_NEG			(1 << 4)
-#define LA_ONLYSHADOW	(1 << 5)
-#define LA_SPHERE		(1 << 6)
+/* #define LA_HALO		(1 << 1) */ /* not used anymore */
+/* #define LA_LAYER		(1 << 2) */ /* not used anymore */
+/* #define LA_QUAD		(1 << 3) */ /* not used anymore */
+/* #define LA_NEG		(1 << 4) */ /* not used anymore */
+/* #define LA_ONLYSHADOW(1 << 5) */ /* not used anymore */
+/* #define LA_SPHERE	(1 << 6) */ /* not used anymore */
 #define LA_SQUARE		(1 << 7)
-#define LA_TEXTURE		(1 << 8)
-#define LA_OSATEX		(1 << 9)
+/* #define LA_TEXTURE	(1 << 8) */ /* not used anymore */
+/* #define LA_OSATEX	(1 << 9) */ /* not used anymore */
 /* #define LA_DEEP_SHADOW	(1 << 10) */ /* not used anywhere */
-#define LA_NO_DIFF		(1 << 11)
-#define LA_NO_SPEC		(1 << 12)
+/* #define LA_NO_DIFF		(1 << 11) */ /* not used anywhere */
+/* #define LA_NO_SPEC		(1 << 12) */ /* not used anywhere */
 #define LA_SHAD_RAY		(1 << 13)
 /* yafray: lamp shadowbuffer flag, softlight */
 /* Since it is used with LOCAL lamp, can't use LA_SHAD */
-/* #define LA_YF_SOFT		(1 << 14) */ /* no longer used */
-#define LA_LAYER_SHADOW	(1 << 15)
-#define LA_SHAD_TEX     (1 << 16)
+/* #define LA_YF_SOFT		(1 << 14) */ /* not used anymore */
+/* #define LA_LAYER_SHADOW	(1 << 15) */ /* not used anymore */
+/* #define LA_SHAD_TEX     	(1 << 16) */ /* not used anymore */
 #define LA_SHOW_CONE    (1 << 17)
-#define LA_SHOW_SHADOW_BOX (1 << 18)
+/* #define LA_SHOW_SHADOW_BOX (1 << 18) */
 #define LA_SHAD_CONTACT (1 << 19)
 
-/* layer_shadow */
-#define LA_LAYER_SHADOW_BOTH	0
-#define LA_LAYER_SHADOW_CAST	1
-#define LA_LAYER_SHADOW_RECEIVE	2
-
-/* sun effect type*/
-#define LA_SUN_EFFECT_SKY			1
-#define LA_SUN_EFFECT_AP			2
-
 /* falloff_type */
 #define LA_FALLOFF_CONSTANT			0
 #define LA_FALLOFF_INVLINEAR		1
@@ -178,47 +144,11 @@ typedef struct Lamp {
 #define LA_FALLOFF_SLIDERS			4
 #define LA_FALLOFF_INVCOEFFICIENTS	5
 
-
-/* buftype, no flag */
-#define LA_SHADBUF_REGULAR		0
-#define LA_SHADBUF_IRREGULAR	1
-#define LA_SHADBUF_HALFWAY		2
-#define LA_SHADBUF_DEEP			3
-
-/* bufflag, auto clipping */
-#define LA_SHADBUF_AUTO_START	1
-#define LA_SHADBUF_AUTO_END		2
-
-/* filtertype */
-#define LA_SHADBUF_BOX		0
-#define LA_SHADBUF_TENT		1
-#define LA_SHADBUF_GAUSS	2
-
 /* area shape */
 #define LA_AREA_SQUARE	0
 #define LA_AREA_RECT	1
 #define LA_AREA_CUBE	2
 #define LA_AREA_BOX		3
 
-/* ray_samp_method */
-#define LA_SAMP_CONSTANT			0
-#define LA_SAMP_HALTON				1
-#define LA_SAMP_HAMMERSLEY			2
-
-
-/* ray_samp_type */
-// #define LA_SAMP_ROUND	1  // UNUSED
-#define LA_SAMP_UMBRA	2
-#define LA_SAMP_DITHER	4
-#define LA_SAMP_JITTER	8
-
-/* mapto */
-#define LAMAP_COL		1
-#define LAMAP_SHAD		2
-
-/* shadowmap_type */
-#define LA_SHADMAP_SIMPLE	0
-#define LA_SHADMAP_VARIANCE	1
-
 #endif /* __DNA_LAMP_TYPES_H__ */
 
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index b6f74c7e6f7..564e6aee3fc 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -40,45 +40,17 @@
 #define MAX_MTEX	18
 #endif
 
-struct MTex;
 struct Image;
-struct ColorBand;
-struct Group;
 struct bNodeTree;
 struct AnimData;
 struct Ipo;
 
 /* WATCH IT: change type? also make changes in ipo.h  */
 
-typedef struct VolumeSettings {
-	float density;
-	float emission;
-	float scattering;
-	float reflection;
-
-	float emission_col[3];
-	float transmission_col[3];
-	float reflection_col[3];
-
-	float density_scale;
-	float depth_cutoff;
-	float asymmetry;
-	
-	short stepsize_type;
-	short shadeflag;
-	short shade_type;
-	short precache_resolution;
-
-	float stepsize;
-	float ms_diff;
-	float ms_intensity;
-	float ms_spread;
-} VolumeSettings;
-
 typedef struct TexPaintSlot {
 	struct Image *ima; /* image to be painted on */
 	char *uvname;      /* customdata index for uv layer, MAX_NAME*/
-	int index;         /* index for mtex slot in material for blender internal */
+	int valid;         /* do we have a valid image and UV map */
 	int pad;
 } TexPaintSlot;
 
@@ -96,127 +68,49 @@ typedef struct Material {
 	ID id;
 	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */ 
 	
-	short material_type, flag;
-	/* note, keep this below synced with render_types.h */
+	short flag, pad1[7];
+
+	/* Colors from Blender Internal that we are still using. */
 	float r, g, b;
 	float specr, specg, specb;
-	float mirr, mirg, mirb;
-	float ambr, ambb, ambg;
-	float amb, emit, ang, spectra, ray_mirror;
-	float alpha, ref, spec, zoffs, add;
-	float translucency;
-	/* end synced with render_types.h */
-	
-	struct VolumeSettings vol;
-
-	float fresnel_mir, fresnel_mir_i;
-	float fresnel_tra, fresnel_tra_i;
-	float filter;		/* filter added, for raytrace transparency and transmissivity */
-	float tx_limit, tx_falloff;
-	short ray_depth, ray_depth_tra;
-	short har;
-	char seed1, seed2;
-	
-	float gloss_mir, gloss_tra;
-	short samp_gloss_mir, samp_gloss_tra;
-	float adapt_thresh_mir, adapt_thresh_tra;
-	float aniso_gloss_mir;
-	float dist_mir;
-	short fadeto_mir;
-	short shade_flag;		/* like Cubic interpolation */
-		
-	int mode, mode_l;		/* mode_l is the or-ed result of all layer modes */
-	int mode2, mode2_l;		/* additional mode flags */
-	short flarec, starc, linec, ringc;
-	float hasize, flaresize, subsize, flareboost;
-	float strand_sta, strand_end, strand_ease, strand_surfnor;
-	float strand_min, strand_widthfade;
-	char strand_uvname[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
-	
-	float sbias;			/* shadow bias to prevent terminator prob */
-	float lbias;			/* factor to multiply lampbias with (0.0 = no mult) */
-	float shad_alpha;		/* in use for irregular shadowbuffer */
-	int	septex;
-	
-	/* for buttons and render*/
-	char rgbsel, texact, pr_type, use_nodes;
-	short pr_lamp, pr_texture, ml_flag;	/* ml_flag is for disable base material */
-	
-	/* mapping */
-	char mapflag, pad;
-
-	/* shaders */
-	short diff_shader, spec_shader;
-	float roughness, refrac;
-	/* XXX param[4] needs review and improvement (shader system as whole anyway)
-	 * This is nasty reused variable for different goals and not easy to RNAify nicely. -jesterKing */
-	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 */
-	struct ColorBand *ramp_col;
-	struct ColorBand *ramp_spec;
-	char rampin_col, rampin_spec;
-	char rampblend_col, rampblend_spec;
-	short ramp_show, pad3;
-	float rampfac_col, rampfac_spec;
-
-	struct MTex *mtex[18];		/* MAX_MTEX */
-	struct bNodeTree *nodetree;
-	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
-	struct Group *group;	/* light group */
-	struct PreviewImage *preview;
+	float alpha, ray_mirror, spec, gloss_mir;
 
-	/* dynamic properties */
-	float friction, fh, reflect;
-	float fhdist, xyfrict;
-	short dynamode, pad2;
+	/* Ror buttons and render. */
+	char pr_type, use_nodes;
+	short pr_lamp, pr_texture;
 
-	/* subsurface scattering */
-	float sss_radius[3], sss_col[3];
-	float sss_error, sss_scale, sss_ior;
-	float sss_colfac, sss_texfac;
-	float sss_front, sss_back;
-	short sss_flag, sss_preset;
+	/* Index for render passes. */
+	short index;
 
-	int mapto_textured;	/* render-time cache to optimize texture lookups */
-	short shadowonly_flag;  /* "shadowsonly" type */
-	short index;            /* custom index for render passes */
+	struct bNodeTree *nodetree;
+	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
+	struct PreviewImage *preview;
 
-	/* Freestyle line settings */
+	/* Freestyle line settings. */
 	float line_col[4];
 	short line_priority;
 	short vcol_alpha;
 
-	/* texture painting */
+	/* Texture painting slots. */
 	short paint_active_slot;
 	short paint_clone_slot;
 	short tot_slots;
-	short pad4[3];
-
-	/* multiple tangent (Normal Map node) */
-	char nmap_tangent_names[9][64]; /* [MAX_MTFACE+1][MAX_NAME]; +1 for empty name */
-	int nmap_tangent_names_count, pad5;
+	short pad2[3];
 
-	/* Transparency */
+	/* Transparency. */
 	float alpha_threshold;
 	float refract_depth;
 	char blend_method;
 	char blend_shadow;
 	char blend_flag;
-	char pad6[5];
+	char pad3[5];
 
-	/* image to use for image/uv space, also bake target
-	 * (not to be used shading/rendering pipeline, this is editor featyure only!). */
-	struct Image *edit_image;
+	/* Cached slots for texture painting, must be refreshed in
+	 * refresh_texpaint_image_cache before using. */
+	struct TexPaintSlot *texpaintslot;
 
-	struct TexPaintSlot *texpaintslot; /* cached slot for painting. Make sure to recalculate before use
-	                                    * with refresh_texpaint_image_cache */
-	ListBase gpumaterial;		/* runtime */
+	/* Runtime cache for GLSL materials. */
+	ListBase gpumaterial;
 } Material;
 
 /* **************** MATERIAL ********************* */
@@ -227,12 +121,6 @@ typedef struct Material {
  * -1 because for active material we store the index + 1 */
 #define MAXMAT			(32767-1)
 
-/* material_type */
-#define MA_TYPE_SURFACE	0
-#define MA_TYPE_HALO	1
-#define MA_TYPE_VOLUME	2
-#define MA_TYPE_WIRE	3
-
 /* flag */
 		/* for render */
 #define MA_IS_USED		1
@@ -244,101 +132,7 @@ typedef struct Material {
 		 */
 #define MA_DS_SHOW_TEXS	4
 
-/* mode (is int) */
-#define MA_TRACEBLE		1
-#define MA_SHADOW		2
-#define MA_SHLESS		4
-#define MA_WIRE			8			/* deprecated */
-#define MA_VERTEXCOL	16
-#define MA_HALO_SOFT	16
-#define MA_HALO			32			/* deprecated */
-#define MA_ZTRANSP		64
-#define MA_VERTEXCOLP	128
-#define MA_ZINV			256
-#define MA_HALO_RINGS	256
-#define MA_ENV			512
-#define MA_HALO_LINES	512
-#define MA_ONLYSHADOW	1024
-#define MA_HALO_XALPHA	1024
-#define MA_STAR			0x800
-// #define MA_FACETEXTURE	0x800	/* deprecated */
-#define MA_HALOTEX		0x1000
-#define MA_HALOPUNO		0x2000
-#define MA_ONLYCAST		0x2000
-#define MA_NOMIST		0x4000
-#define MA_HALO_SHADE	0x4000
-#define MA_HALO_FLARE	0x8000
-#define MA_TRANSP		0x10000
-#define MA_RAYTRANSP	0x20000
-#define MA_RAYMIRROR	0x40000
-#define MA_SHADOW_TRA	0x80000
-#define MA_RAMP_COL		0x100000
-#define MA_RAMP_SPEC	0x200000
-#define MA_RAYBIAS		0x400000
-#define MA_FULL_OSA		0x800000
-#define MA_TANGENT_STR	0x1000000
-#define MA_SHADBUF		0x2000000
-		/* note; we drop MA_TANGENT_STR later to become tangent_u */
-#define MA_TANGENT_V	0x4000000
-/* qdn: a bit clumsy this, tangents needed for normal maps separated from shading */
-#define MA_NORMAP_TANG	0x8000000
-#define MA_GROUP_NOLAY	0x10000000
-// #define MA_FACETEXTURE_ALPHA	0x20000000	/* deprecated */
-#define MA_STR_B_UNITS	0x40000000
-#define MA_STR_SURFDIFF 0x80000000
-
-#define	MA_MODE_MASK	0x6fffffff	/* all valid mode bits */
-#define MA_MODE_PIPELINE	(MA_TRANSP | MA_ZTRANSP | MA_RAYTRANSP \
-				 | MA_TRACEBLE | MA_FULL_OSA | MA_ENV | MA_ZINV \
-				 | MA_ONLYCAST | MA_SHADBUF)
-
-/* mode2 (is int) */
-#define MA_CASTSHADOW		(1 << 0)
-#define MA_MODE2_PIPELINE	(MA_CASTSHADOW)
-#define MA_TANGENT_CONCRETE	(1 << 1)
-
-/* mapflag */
-#define MA_MAPFLAG_UVPROJECT (1 << 0)
-
-/* ray mirror fadeout */
-#define MA_RAYMIR_FADETOSKY	0
-#define MA_RAYMIR_FADETOMAT	1
-
-/* shadowonly_flag */
-#define MA_SO_OLD			0
-#define MA_SO_SHADOW		1
-#define MA_SO_SHADED		2
-
-/* shade_flag */
-#define MA_CUBIC			1
-#define MA_OBCOLOR			2
-#define MA_APPROX_OCCLUSION	4
-#define MA_GROUP_LOCAL      8
-
-/* diff_shader */
-#define MA_DIFF_LAMBERT		0
-#define MA_DIFF_ORENNAYAR	1
-#define MA_DIFF_TOON		2
-#define MA_DIFF_MINNAERT    3
-#define MA_DIFF_FRESNEL     4
-
-/* spec_shader */
-#define MA_SPEC_COOKTORR	0
-#define MA_SPEC_PHONG		1
-#define MA_SPEC_BLINN		2
-#define MA_SPEC_TOON		3
-#define MA_SPEC_WARDISO		4
-
-/* dynamode */
-// #define MA_DRAW_DYNABUTS    1		/* deprecated */
-#define MA_FH_NOR	        2
-
 /* ramps */
-#define MA_RAMP_IN_SHADER	0
-#define MA_RAMP_IN_ENERGY	1
-#define MA_RAMP_IN_NOR		2
-#define MA_RAMP_IN_RESULT	3
-
 #define MA_RAMP_BLEND		0
 #define MA_RAMP_ADD			1
 #define MA_RAMP_MULT		2
@@ -380,38 +174,7 @@ typedef struct Material {
 
 /* mapto */
 #define MAP_COL			1
-#define MAP_NORM		2
-#define MAP_COLSPEC		4
-#define MAP_COLMIR		8
-#define MAP_VARS		(0xFFF0)
-#define MAP_REF			16
-#define MAP_SPEC		32
-#define MAP_EMIT		64
 #define MAP_ALPHA		128
-#define MAP_HAR			256
-#define MAP_RAYMIRR		512
-#define MAP_TRANSLU		1024
-#define MAP_AMB			2048
-#define MAP_DISPLACE	4096
-#define MAP_WARP		8192
-// #define MAP_LAYER		16384		/* unused */
-
-/* volume mapto - reuse definitions for now - a bit naughty! */
-#define MAP_DENSITY				128
-#define MAP_EMISSION			64
-#define MAP_EMISSION_COL		1
-#define MAP_SCATTERING			16
-#define MAP_TRANSMISSION_COL	8
-#define MAP_REFLECTION_COL		4
-#define MAP_REFLECTION			32
-
-
-/* mapto for halo */
-//#define MAP_HA_COL		1
-//#define MAP_HA_ALPHA	128
-//#define MAP_HA_HAR		256
-//#define MAP_HA_SIZE		2
-//#define MAP_HA_ADD		64
 
 /* pmapto */
 /* init */
@@ -444,25 +207,6 @@ typedef struct Material {
 #define MA_HAIR			10
 #define MA_ATMOS		11
 
-/* sss_flag */
-#define MA_DIFF_SSS		1
-
-/* vol_stepsize_type */
-#define MA_VOL_STEP_RANDOMIZED	0
-#define MA_VOL_STEP_CONSTANT	1
-#define MA_VOL_STEP_ADAPTIVE	2
-
-/* vol_shadeflag */
-#define MA_VOL_RECV_EXT_SHADOW	1
-#define MA_VOL_PRECACHESHADING	8
-
-/* vol_shading_type */
-#define MA_VOL_SHADE_SHADELESS					0
-#define MA_VOL_SHADE_SHADOWED					2
-#define MA_VOL_SHADE_SHADED						1
-#define MA_VOL_SHADE_MULTIPLE					3
-#define MA_VOL_SHADE_SHADEDPLUSMULTIPLE			4
-
 /* blend_method */
 enum {
 	MA_BM_SOLID,
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 64e6ce3d522..a7f9acb8a42 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -419,7 +419,6 @@ typedef struct UVProjectModifierData {
 
 	/* the objects which do the projecting */
 	struct Object *projectors[10]; /* MOD_UVPROJECT_MAXPROJECTORS */
-	struct Image *image;           /* the image to project */
 	int pad2;
 	int num_projectors;
 	float aspectx, aspecty;
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 63eecebf44a..b5a3752072b 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -653,11 +653,6 @@ typedef struct NodeTwoFloats {
 	float x, y;
 } NodeTwoFloats;
 
-typedef struct NodeGeometry {
-	char uvname[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
-	char colname[64];
-} NodeGeometry;
-
 typedef struct NodeVertexCol {
 	char name[64];
 } NodeVertexCol;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index bb17b10b299..0f9cbc06fa8 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -442,8 +442,6 @@ enum {
 	OB_MATERIAL  = 4,
 	OB_TEXTURE   = 5,
 	OB_RENDER    = 6,
-
-	OB_PAINT     = 100,  /* temporary used in draw code */
 };
 
 /* dtx: flags (short) */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 18502158e4b..8a09cced24b 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -571,29 +571,14 @@ typedef struct RenderData {
 
 	float framelen, blurfac;
 
-	/** For UR edge rendering: give the edges this color */
-	float edgeR, edgeG, edgeB;
-
-
-	/* standalone player */  //  XXX deprecated since 2.5
-	short fullscreen  DNA_DEPRECATED, xplay  DNA_DEPRECATED, yplay  DNA_DEPRECATED;
-	short freqplay  DNA_DEPRECATED;
-	/* standalone player */  //  XXX deprecated since 2.5
-	short depth  DNA_DEPRECATED, attrib  DNA_DEPRECATED;
-
-
 	int frame_step;		/* frames to jump during render/playback */
 
 	short stereomode  DNA_DEPRECATED;	/* standalone player stereo settings */  //  XXX deprecated since 2.5
 	
 	short dimensionspreset;		/* for the dimensions presets menu */
 
-	short filtertype;	/* filter is box, tent, gauss, mitch, etc */
-
 	short size; /* size in % */
 	
-	short maximsize DNA_DEPRECATED; /* max in Kb */
-
 	short pad6;
 
 	/* from buttons: */
@@ -607,15 +592,6 @@ typedef struct RenderData {
 	int ysch;
 
 	/**
-	 * The number of part to use in the x direction
-	 */
-	short xparts DNA_DEPRECATED;
-	/**
-	 * The number of part to use in the y direction
-	 */
-	short yparts DNA_DEPRECATED;
-
-	/**
 	 * render tile dimensions
 	 */
 	int tilex, tiley;
@@ -640,22 +616,6 @@ typedef struct RenderData {
 	int mode;
 
 	/**
-	 * Flags for raytrace settings. Use bit-masking to access the settings.
-	 */
-	int raytrace_options;
-	
-	/**
-	 * Raytrace acceleration structure
-	 */
-	short raytrace_structure;
-
-	short pad1;
-
-	/* octree resolution */
-	short ocres;
-	short pad4;
-	
-	/**
 	 * What to do with the sky/background. Picks sky/premul/key
 	 * blending for the background
 	 */
@@ -666,7 +626,7 @@ typedef struct RenderData {
 	 */
 	short osa;
 
-	short frs_sec, edgeint;
+	short frs_sec, pad[7];
 
 	
 	/* safety, border and display rect */
@@ -676,9 +636,7 @@ typedef struct RenderData {
 	/* information on different layers to be rendered */
 	ListBase layers DNA_DEPRECATED; /* Converted to Scene->view_layers. */
 	short actlay DNA_DEPRECATED; /* Converted to Scene->active_layer. */
-	
-	/* number of mblur samples */
-	short mblur_samples;
+	short pad1;
 	
 	/**
 	 * Adjustment factors for the aspect ratio in the x direction, was a short in 2.45
@@ -695,18 +653,13 @@ typedef struct RenderData {
 	/* color management settings - color profiles, gamma correction, etc */
 	int color_mgt_flag;
 	
-	/** post-production settings. deprecated, but here for upwards compat (initialized to 1) */
-	float postgamma, posthue, postsat;
-	
 	 /* Dither noise intensity */
 	float dither_intensity;
 	
 	/* Bake Render options */
-	short bake_osa, bake_filter, bake_mode, bake_flag;
-	short bake_normal_space, bake_quad_split;
-	float bake_maxdist, bake_biasdist;
-	short bake_samples, bake_pad;
-	float bake_user_scale, bake_pad1;
+	short bake_mode, bake_flag;
+	short bake_filter, bake_samples;
+	float bake_biasdist, bake_user_scale;
 
 	/* path to render output */
 	char pic[1024]; /* 1024 = FILE_MAX */
@@ -729,21 +682,11 @@ typedef struct RenderData {
 	char pad5[5];
 
 	/* render simplify */
-	int simplify_flag;
 	short simplify_subsurf;
 	short simplify_subsurf_render;
-	short simplify_shadowsamples, pad9;
+	short pad9, pad10;
 	float simplify_particles;
 	float simplify_particles_render;
-	float simplify_aosss;
-
-	/* cineon */
-	short cineonwhite  DNA_DEPRECATED, cineonblack  DNA_DEPRECATED;  /*deprecated*/
-	float cineongamma  DNA_DEPRECATED;  /*deprecated*/
-	
-	/* jpeg2000 */
-	short jp2_preset  DNA_DEPRECATED, jp2_depth  DNA_DEPRECATED;  /*deprecated*/
-	int rpad3;
 
 	/* Freestyle line thickness options */
 	int line_thickness_mode;
@@ -751,6 +694,7 @@ typedef struct RenderData {
 
 	/* render engine */
 	char engine[32];
+	int pad2;
 
 	/* Cycles baking */
 	struct BakeData bake;
@@ -1540,25 +1484,25 @@ typedef struct Scene {
 
 /* RenderData.mode */
 #define R_OSA			0x0001
-#define R_SHADOW		0x0002
-#define R_GAMMA			0x0004
-#define R_ORTHO			0x0008
-#define R_ENVMAP		0x0010
-#define R_EDGE			0x0020
-#define R_FIELDS		0x0040
-#define R_FIELDSTILL	0x0080
+/* #define R_SHADOW		0x0002 */
+/* #define R_GAMMA			0x0004 */
+#define R_ORTHO			0x0008 
+/* #define R_ENVMAP		0x0010 */
+/* #define R_EDGE			0x0020 */
+/* #define R_FIELDS		0x0040 */
+/*#define R_FIELDSTILL	0x0080 */
 /*#define R_RADIO			0x0100 */ /* deprecated */
 #define R_BORDER		0x0200
-#define R_PANORAMA		0x0400	/* deprecated as scene option, still used in renderer */
+#define R_PANORAMA		0x0400
 #define R_CROP			0x0800
 		/* Disable camera switching: runtime (DURIAN_CAMERA_SWITCH) */
 #define R_NO_CAMERA_SWITCH	0x1000
-#define R_ODDFIELD		0x2000
+/* #define R_ODDFIELD		0x2000 */
 #define R_MBLUR			0x4000
 		/* unified was here */
-#define R_RAYTRACE      0x10000
+/* #define R_RAYTRACE      0x10000 */
 		/* R_GAUSS is obsolete, but used to retrieve setting from old files */
-#define R_GAUSS      	0x20000
+/* #define R_GAUSS      	0x20000 */
 		/* fbuf obsolete... */
 /*#define R_FBUF			0x40000*/
 		/* threads obsolete... is there for old files, now use for autodetect threads */
@@ -1566,14 +1510,14 @@ typedef struct Scene {
 		/* Use the same flag for autothreads */
 #define R_FIXED_THREADS		0x80000 
 
-#define R_SPEED				0x100000
-#define R_SSS				0x200000
+/* #define R_SPEED				0x100000 */
+/* #define R_SSS				0x200000 */
 #define R_NO_OVERWRITE		0x400000  /* skip existing files */
 #define R_TOUCH				0x800000  /* touch files before rendering */
 #define R_SIMPLIFY			0x1000000
 #define R_EDGE_FRS			0x2000000 /* R_EDGE reserved for Freestyle */
 #define R_PERSISTENT_DATA	0x4000000 /* keep data around for re-render */
-#define R_USE_WS_SHADING	0x8000000 /* use world space interpretation of lighting data */
+/* #define R_USE_WS_SHADING	0x8000000 */ /* use world space interpretation of lighting data */
 
 /* RenderData.seq_flag */
 enum {
@@ -1590,7 +1534,7 @@ enum {
 #define R_OUTPUT_NONE	3
 /*#define R_OUTPUT_FORKED	4*/
 
-/* RenderData.filtertype */
+/* RenderData.filtertype (used for nodes) */
 #define R_FILTER_BOX	0
 #define R_FILTER_TENT	1
 #define R_FILTER_QUAD	2
@@ -1598,19 +1542,7 @@ enum {
 #define R_FILTER_CATROM	4
 #define R_FILTER_GAUSS	5
 #define R_FILTER_MITCH	6
-#define R_FILTER_FAST_GAUSS	7 /* note, this is only used for nodes at the moment */
-
-/* RenderData.raytrace_structure */
-#define R_RAYSTRUCTURE_AUTO				0
-#define R_RAYSTRUCTURE_OCTREE			1
-#define R_RAYSTRUCTURE_BLIBVH			2	/* removed */
-#define R_RAYSTRUCTURE_VBVH				3
-#define R_RAYSTRUCTURE_SIMD_SVBVH		4	/* needs SIMD */
-#define R_RAYSTRUCTURE_SIMD_QBVH		5	/* needs SIMD */
-
-/* RenderData.raytrace_options */
-#define R_RAYTRACE_USE_LOCAL_COORDS		0x0001
-#define R_RAYTRACE_USE_INSTANCES		0x0002
+#define R_FILTER_FAST_GAUSS	7
 
 /* RenderData.scemode (int now) */
 #define R_DOSEQ				0x0001
@@ -1622,12 +1554,12 @@ enum {
 #define R_MATNODE_PREVIEW	0x0020
 #define R_DOCOMP			0x0040
 #define R_COMP_CROP			0x0080
-#define R_FREE_IMAGE		0x0100
+/* #define R_FREE_IMAGE		0x0100 */
 #define R_SINGLE_LAYER		0x0200
 #define R_EXR_TILE_FILE		0x0400
 /* #define R_COMP_FREE			0x0800 */
 #define R_NO_IMAGE_LOAD		0x1000
-#define R_NO_TEX			0x2000
+/* #define R_NO_TEX			0x2000 */
 #define R_NO_FRAME_UPDATE	0x4000
 #define R_FULL_SAMPLE		0x8000
 /* #define R_DEPRECATED		0x10000 */
@@ -1690,12 +1622,12 @@ enum {
 /* bake_mode: same as RE_BAKE_xxx defines */
 /* RenderData.bake_flag */
 #define R_BAKE_CLEAR		1
-#define R_BAKE_OSA			2
+/* #define R_BAKE_OSA		2 */ /* deprecated */
 #define R_BAKE_TO_ACTIVE	4
-#define R_BAKE_NORMALIZE	8
+/* #define R_BAKE_NORMALIZE	8 */ /* deprecated */
 #define R_BAKE_MULTIRES		16
 #define R_BAKE_LORES_MESH	32
-#define R_BAKE_VCOL			64
+/* #define R_BAKE_VCOL		64 */ /* deprecated */
 #define R_BAKE_USERSCALE	128
 #define R_BAKE_CAGE			256
 #define R_BAKE_SPLIT_MAT	512
@@ -1707,9 +1639,6 @@ enum {
 #define R_BAKE_SPACE_OBJECT	 2
 #define R_BAKE_SPACE_TANGENT 3
 
-/* RenderData.simplify_flag */
-#define R_SIMPLE_NO_TRIANGULATE		1
-
 /* RenderData.line_thickness_mode */
 #define R_LINE_THICKNESS_ABSOLUTE 1
 #define R_LINE_THICKNESS_RELATIVE 2
@@ -1717,7 +1646,6 @@ enum {
 /* sequencer seq_prev_type seq_rend_type */
 
 /* RenderData.engine (scene.c) */
-extern const char *RE_engine_id_BLENDER_RENDER;
 extern const char *RE_engine_id_BLENDER_CLAY;
 extern const char *RE_engine_id_BLENDER_EEVEE;
 extern const char *RE_engine_id_BLENDER_WORKBENCH;
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index d763c7ca4f9..904ffc959d8 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -124,11 +124,9 @@ typedef struct SpaceButs {
 	short mainb, mainbo, mainbuser; /* context tabs */
 	short re_align, align;          /* align for panels */
 	short preview;                  /* preview is signal to refresh */
-	/* texture context selector (material, lamp, particles, world, other) */
-	short texture_context, texture_context_prev;
 	char flag;
 	char collection_context;
-	char pad[6];
+	char pad[2];
 	
 	void *path;                     /* runtime */
 	int pathflag, dataicon;         /* runtime */
@@ -200,16 +198,6 @@ typedef enum eSpaceButtons_Flag {
 	SB_SHADING_CONTEXT = (1 << 4),
 } eSpaceButtons_Flag;
 
-/* sbuts->texture_context */
-typedef enum eSpaceButtons_Texture_Context {
-	SB_TEXC_MATERIAL = 0,
-	SB_TEXC_WORLD = 1,
-	SB_TEXC_LAMP = 2,
-	SB_TEXC_PARTICLES = 3,
-	SB_TEXC_OTHER = 4,
-	SB_TEXC_LINESTYLE = 5,
-} eSpaceButtons_Texture_Context;
-
 /* sbuts->collection_context */
 typedef enum eSpaceButtons_Collection_Context {
 	SB_COLLECTION_CTX_VIEW_LAYER = 0,
@@ -1217,14 +1205,14 @@ typedef enum eSpaceNode_Flag {
 	SNODE_AUTO_RENDER    = (1 << 5),
 //	SNODE_SHOW_HIGHLIGHT = (1 << 6), DNA_DEPRECATED
 //	SNODE_USE_HIDDEN_PREVIEW = (1 << 10), DNA_DEPRECATED December2013 
-	SNODE_NEW_SHADERS    = (1 << 11),
+//	SNODE_NEW_SHADERS    = (1 << 11), DNA_DEPRECATED
 	SNODE_PIN            = (1 << 12),
 	SNODE_SKIP_INSOFFSET = (1 << 13), /* automatically offset following nodes in a chain on insertion */
 } eSpaceNode_Flag;
 
 /* snode->texfrom */
 typedef enum eSpaceNode_TexFrom {
-	SNODE_TEX_OBJECT   = 0,
+	/* SNODE_TEX_OBJECT   = 0, */
 	SNODE_TEX_WORLD    = 1,
 	SNODE_TEX_BRUSH    = 2,
 	SNODE_TEX_LINESTYLE = 3,
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 0eb54a9b5b3..f5267f20d2c 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -45,13 +45,11 @@ extern "C" {
 struct AnimData;
 struct Ipo;
 struct ColorBand;
-struct EnvMap;
 struct Object;
 struct Tex;
 struct Image;
 struct PreviewImage;
 struct ImBuf;
-struct Ocean;
 struct CurveMapping;
 
 typedef struct MTex {
@@ -121,21 +119,6 @@ typedef struct ColorBand {
 	CBData data[32];
 } ColorBand;
 
-typedef struct EnvMap {
-	struct Object *object;
-	struct Image *ima;		/* type ENV_LOAD */
-	struct ImBuf *cube[6];		/* these images are dynamic, not part of the main struct */
-	float imat[4][4];
-	float obimat[3][3];
-	short type, stype;
-	float clipsta, clipend;
-	float viewscale;	/* viewscale is for planar envmaps to zoom in or out */
-	unsigned int notlay;
-	short cuberes, depth;
-	int ok, lastframe;
-	short recalc, lastsize;
-} EnvMap;
-
 typedef struct PointDensity {
 	short flag;
 
@@ -172,38 +155,6 @@ typedef struct PointDensity {
 	struct CurveMapping *falloff_curve; /* falloff density curve */
 } PointDensity;
 
-typedef struct VoxelData {
-	int resol[3];
-	int interp_type;
-	short file_format;
-	short flag;
-	short extend;
-	short smoked_type;
-	short hair_type;
-	short data_type;
-	int _pad;
-	
-	struct Object *object; /* for rendering smoke sims */
-	float int_multiplier;
-	int still_frame;
-	char source_path[1024];  /* 1024 = FILE_MAX */
-
-	/* temporary data */
-	float *dataset;
-	int cachedframe;
-	int ok;
-	
-} VoxelData;
-
-typedef struct OceanTex {
-	struct Object *object;
-	char oceanmod[64];
-	
-	int output;
-	int pad;
-	
-} OceanTex;
-	
 typedef struct Tex {
 	ID id;
 	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */ 
@@ -254,11 +205,7 @@ typedef struct Tex {
 	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
 	struct Image *ima;
 	struct ColorBand *coba;
-	struct EnvMap *env;
 	struct PreviewImage *preview;
-	struct PointDensity *pd;
-	struct VoxelData *vd;
-	struct OceanTex *ot;
 	
 	char use_nodes;
 	char pad[7];
@@ -316,13 +263,13 @@ typedef struct ColorMapping {
 #define TEX_NOISE		7
 #define TEX_IMAGE		8
 //#define TEX_PLUGIN		9 /* Deprecated */
-#define TEX_ENVMAP		10
+//#define TEX_ENVMAP		10 /* Deprecated */
 #define TEX_MUSGRAVE	11
 #define TEX_VORONOI		12
 #define TEX_DISTNOISE	13
-#define TEX_POINTDENSITY	14
-#define TEX_VOXELDATA		15
-#define TEX_OCEAN		16
+//#define TEX_POINTDENSITY	14 /* Deprecated */
+//#define TEX_VOXELDATA		15 /* Deprecated */
+//#define TEX_OCEAN			16 /* Deprecated */
 
 /* musgrave stype */
 #define TEX_MFRACTAL		0
@@ -549,22 +496,6 @@ enum {
 	COLBAND_HUE_CCW     = 3,
 };
 
-/* **************** EnvMap ********************* */
-
-/* type */
-#define ENV_CUBE	0
-#define ENV_PLANE	1
-#define ENV_SPHERE	2
-
-/* stype */
-#define ENV_STATIC	0
-#define ENV_ANIM	1
-#define ENV_LOAD	2
-
-/* ok */
-#define ENV_NORMAL	1
-#define ENV_OSA		2
-
 /* **************** PointDensity ********************* */
 
 /* source */
@@ -592,9 +523,9 @@ enum {
 
 /* noise_influence */
 #define TEX_PD_NOISE_STATIC		0
-#define TEX_PD_NOISE_VEL		1
-#define TEX_PD_NOISE_AGE		2
-#define TEX_PD_NOISE_TIME		3
+/* #define TEX_PD_NOISE_VEL		1 */ /* Deprecated */
+/* #define TEX_PD_NOISE_AGE		2 */ /* Deprecated */
+/* #define TEX_PD_NOISE_TIME	3 */ /* Deprecated */
 
 /* color_source */
 enum {
@@ -613,55 +544,6 @@ enum {
 #define POINT_DATA_LIFE		2
 #define POINT_DATA_COLOR	4
 
-/******************** Voxel Data *****************************/
-/* flag */
-#define TEX_VD_STILL			1
-
-/* interpolation */
-#define TEX_VD_NEARESTNEIGHBOR		0
-#define TEX_VD_LINEAR				1
-#define TEX_VD_QUADRATIC        2
-#define TEX_VD_TRICUBIC_CATROM  3
-#define TEX_VD_TRICUBIC_BSPLINE 4
-#define TEX_VD_TRICUBIC_SLOW    5
-
-/* file format */
-#define TEX_VD_BLENDERVOXEL		0
-#define TEX_VD_RAW_8BIT			1
-#define TEX_VD_RAW_16BIT		2
-#define TEX_VD_IMAGE_SEQUENCE	3
-#define TEX_VD_SMOKE			4
-#define TEX_VD_HAIR				5
-/* for voxels which use VoxelData->source_path */
-#define TEX_VD_IS_SOURCE_PATH(_format) (ELEM(_format, TEX_VD_BLENDERVOXEL, TEX_VD_RAW_8BIT, TEX_VD_RAW_16BIT))
-
-/* smoke data types */
-#define TEX_VD_SMOKEDENSITY		0
-#define TEX_VD_SMOKEHEAT		1
-#define TEX_VD_SMOKEVEL			2
-#define TEX_VD_SMOKEFLAME		3
-
-#define TEX_VD_HAIRDENSITY		0
-#define TEX_VD_HAIRVELOCITY		1
-#define TEX_VD_HAIRENERGY		2
-#define TEX_VD_HAIRRESTDENSITY	3
-
-/* data_type */
-#define TEX_VD_INTENSITY		0
-#define TEX_VD_RGBA_PREMUL		1
-
-/******************** Ocean *****************************/
-/* output */
-#define TEX_OCN_DISPLACEMENT	1
-#define TEX_OCN_FOAM			2
-#define TEX_OCN_JPLUS			3
-#define TEX_OCN_EMINUS			4	
-#define TEX_OCN_EPLUS			5
-
-/* flag */
-#define TEX_OCN_GENERATE_NORMALS	1	
-#define TEX_OCN_XZ				2	
-	
 #ifdef __cplusplus
 }
 #endif
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index f30ffa84b73..ac93033609d 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -56,8 +56,6 @@ typedef struct World {
 	short texact, mistype;
 
 	float horr, horg, horb;
-	float zenr, zeng, zenb;
-	float ambr, ambg, ambb;
 
 	/**
 	 * Exposure= mult factor. unused now, but maybe back later. Kept in to be upward compat.
@@ -67,42 +65,22 @@ typedef struct World {
 	float exposure, exp, range;
 	float linfac, logfac;
 	
-	short skytype;
 	/**
 	 * Some world modes
 	 * bit 0: Do mist
-	 * bit 1: Do stars
-	 * bit 2: (reserved) depth of field
-	 * bit 3: (gameengine): Activity culling is enabled.
-	 * bit 4: ambient occlusion
-	 * bit 5: (gameengine) : enable Bullet DBVT tree for view frustum culling 
 	 */
 	short mode;												// partially moved to scene->gamedata in 2.5
-	short pad2[2];
+	short pad2[3];
 
 	float misi, miststa, mistdist, misthi;
 
-	/* unused now: DOF */
-	short dofsta, dofend, dofmin, dofmax;
-	
 	/* ambient occlusion */
-	float aodist, aodistfac, aoenergy, aobias;
-	short aomode, aosamp, aomix, aocolor;
-	float ao_adapt_thresh, ao_adapt_speed_fac;
-	float ao_approx_error, ao_approx_correction;
-	float ao_indirect_energy, ao_env_energy, ao_pad2;
-	short ao_indirect_bounces, ao_pad;
-	short ao_samp_method, ao_gather_method, ao_approx_passes;
-	
-	/* assorted settings (in the middle of ambient occlusion settings for padding reasons) */
-	short flag;
-	
-	/* ambient occlusion (contd...) */
-	float *aosphere, *aotables;
+	float aodist, aoenergy;
 	
+	/* assorted settings  */
+	short flag, pad3[3];
 	
 	struct Ipo *ipo  DNA_DEPRECATED;  /* old animation system, deprecated for 2.5 */
-	struct MTex *mtex[18];		/* MAX_MTEX */
 	short pr_texture, use_nodes, pad;
 	short update_flag;          /* XXX temporary flag waiting for depsgraph proper tagging */
 
@@ -118,33 +96,15 @@ typedef struct World {
 
 /* **************** WORLD ********************* */
 
-/* skytype */
-#define WO_SKYBLEND		1
-#define WO_SKYREAL		2
-#define WO_SKYPAPER		4
-/* while render: */
-#define WO_SKYTEX		8
-#define WO_ZENUP		16
-
 /* mode */
 #define WO_MIST	               1
 //#define WO_STARS               2 /* deprecated */
 /*#define WO_DOF                 4*/
 //#define WO_ACTIVITY_CULLING	   8 /* deprecated */
-#define WO_ENV_LIGHT   		  16
+//#define WO_ENV_LIGHT   		  16
 //#define WO_DBVT_CULLING		  32 /* deprecated */
 #define WO_AMB_OCC   		  64
-#define WO_INDIRECT_LIGHT	  128
-
-/* aomix */
-enum {
-	WO_AOADD    = 0,
-#ifdef DNA_DEPRECATED
-	WO_AOSUB    = 1,  /* deprecated */
-	WO_AOADDSUB = 2,  /* deprecated */
-#endif
-	WO_AOMUL    = 3,
-};
+//#define WO_INDIRECT_LIGHT	  128
 
 enum {
 	WO_MIST_QUADRATIC          = 0,
@@ -152,38 +112,6 @@ enum {
 	WO_MIST_INVERSE_QUADRATIC  = 2,
 };
 
-/* ao_samp_method - methods for sampling the AO hemi */
-#define WO_AOSAMP_CONSTANT			0
-#define WO_AOSAMP_HALTON			1
-#define WO_AOSAMP_HAMMERSLEY		2
-
-/* aomode (use distances & random sampling modes) */
-#define WO_AODIST		1
-#define WO_AORNDSMP		2
-#define WO_AOCACHE		4
-
-/* aocolor */
-#define WO_AOPLAIN	0
-#define WO_AOSKYCOL	1
-#define WO_AOSKYTEX	2
-
-/* ao_gather_method */
-#define WO_AOGATHER_RAYTRACE	0
-#define WO_AOGATHER_APPROX		1
-
-/* texco (also in DNA_material_types.h) */
-#define TEXCO_ANGMAP	64
-#define TEXCO_H_SPHEREMAP	256
-#define TEXCO_H_TUBEMAP	1024
-#define TEXCO_EQUIRECTMAP 2048
-
-/* mapto */
-#define WOMAP_BLEND		1
-#define WOMAP_HORIZ		2
-#define WOMAP_ZENUP		4
-#define WOMAP_ZENDOWN	8
-// #define WOMAP_MIST		16 /* Deprecated */
-
 /* flag */
 #define WO_DS_EXPAND	(1<<0)
 	/* NOTE: this must have the same value as MA_DS_SHOW_TEXS,