diff --git a/source/blender/makesdna/DNA_texture_defaults.h b/source/blender/makesdna/DNA_texture_defaults.h
index 8e5ecd2fa05..fe85af7c062 100644
--- a/source/blender/makesdna/DNA_texture_defaults.h
+++ b/source/blender/makesdna/DNA_texture_defaults.h
@@ -31,7 +31,6 @@
     .size[1] = 1.0, \
     .size[2] = 1.0, \
     .tex = NULL, \
-    .colormodel = 0, \
     .r = 1.0, \
     .g = 0.0, \
     .b = 1.0, \
@@ -39,29 +38,7 @@
     .def_var = 1.0, \
     .blendtype = MTEX_BLEND, \
     .colfac = 1.0, \
-    .norfac = 1.0, \
-    .varfac = 1.0, \
-    .dispfac = 0.2, \
-    .colspecfac = 1.0f, \
-    .mirrfac = 1.0f, \
     .alphafac = 1.0f, \
-    .difffac = 1.0f, \
-    .specfac = 1.0f, \
-    .emitfac = 1.0f, \
-    .hardfac = 1.0f, \
-    .raymirrfac = 1.0f, \
-    .translfac = 1.0f, \
-    .ambfac = 1.0f, \
-    .colemitfac = 1.0f, \
-    .colreflfac = 1.0f, \
-    .coltransfac = 1.0f, \
-    .densfac = 1.0f, \
-    .scatterfac = 1.0f, \
-    .reflfac = 1.0f, \
-    .shadowfac = 1.0f, \
-    .zenupfac = 1.0f, \
-    .zendownfac = 1.0f, \
-    .blendfac = 1.0f, \
     .timefac = 1.0f, \
     .lengthfac = 1.0f, \
     .clumpfac = 1.0f, \
@@ -76,7 +53,6 @@
     .dampfac = 1.0f, \
     .gravityfac = 1.0f, \
     .fieldfac = 1.0f, \
-    .normapspace = MTEX_NSPACE_TANGENT, \
     .brush_map_mode = MTEX_MAP_MODE_TILED, \
     .random_angle = 2.0f * (float)M_PI, \
     .brush_angle_mode = 0, \
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 4d467f0cd3b..4832491aa9b 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -28,46 +28,36 @@ struct Tex;
 typedef struct MTex {
   DNA_DEFINE_CXX_METHODS(MTex)
 
-  short texco, mapto, maptoneg, blendtype;
+  short texco, mapto, blendtype;
+  char _pad2[2];
   struct Object *object;
   struct Tex *tex;
   /** MAX_CUSTOMDATA_LAYER_NAME. */
   char uvname[68];
-  char _pad1[4];
 
   char projx, projy, projz, mapping;
   char brush_map_mode, brush_angle_mode;
-  char _pad[2];
+
+  /**
+   * Match against the texture node (#TEX_NODE_OUTPUT, #bNode::custom1 value).
+   * otherwise zero when unspecified (default).
+   */
+  short which_output;
+
   float ofs[3], size[3], rot, random_angle;
 
-  char _pad0[2];
-  short colormodel;
-  short normapspace, which_output;
   float r, g, b, k;
   float def_var;
 
   /* common */
-  float colfac, varfac;
-
-  /* material */
-  float norfac, dispfac, warpfac;
-  float colspecfac, mirrfac, alphafac;
-  float difffac, specfac, emitfac, hardfac;
-  float raymirrfac, translfac, ambfac;
-  float colemitfac, colreflfac, coltransfac;
-  float densfac, scatterfac, reflfac;
+  float colfac;
+  float alphafac;
 
   /* particles */
   float timefac, lengthfac, clumpfac, dampfac;
   float kinkfac, kinkampfac, roughfac, padensfac, gravityfac;
   float lifefac, sizefac, ivelfac, fieldfac;
   float twistfac;
-
-  /* light */
-  float shadowfac;
-
-  /* world */
-  float zenupfac, zendownfac, blendfac;
 } MTex;
 
 #ifndef DNA_USHORT_FIX