Cleanup: unused DNA

3 files changed, 4 insertions, 8 deletions

diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c
index 144f9e34c20..158d2954100 100644
--- a/source/blender/blenkernel/intern/lamp.c
+++ b/source/blender/blenkernel/intern/lamp.c
@@ -59,7 +59,6 @@ void BKE_lamp_init(Lamp *la)
 	BLI_assert(MEMCMP_STRUCT_OFS_IS_ZERO(la, id));
 
 	la->r = la->g = la->b = la->k = 1.0f;
-	la->haint = 1.0f;
 	la->energy = 10.0f;
 	la->dist = 25.0f;
 	la->spotsize = DEG2RADF(45.0f);
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index 43606cbcd9d..6294afe00e7 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -51,15 +51,12 @@ typedef struct Lamp {
 	
 	short type, flag;
 	int mode;
-	
-	short colormodel, totex;
+
 	float r, g, b, k;
 	float shdwr, shdwg, shdwb, shdwpad;
 	
 	float energy, dist, spotsize, spotblend;
-	float haint;
-	
-	
+
 	float att1, att2;	/* Quad1 and Quad2 attenuation */
 	float coeff_const, coeff_lin, coeff_quad, coeff_pad;
 	struct CurveMapping *curfalloff;
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index ac93033609d..84050894faa 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -51,8 +51,8 @@ struct MTex;
 typedef struct World {
 	ID id;
 	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */ 
-	
-	short colormodel, totex;
+
+	char _pad0[4];
 	short texact, mistype;
 
 	float horr, horg, horb;