DNA: clear / remove deprecated flags

- Clear deprecated flags for ID's:
  Scene, Sequence, World, Object & Mesh.
- Clear deprecated flags for Spaces: outliner, 3D view & image.
- Remove unused `Mesh.drawflag`
- Remove unused `USER_ALLWINCODECS`, `USER_MMB_PASTE`.
- Remove `V3D_SOLID_TEX` & `V3D_ZBUF_SELECT` - used in a few areas.
- Flip `Object.empty_image_visibility_flag`
  (avoids do-version on each new flag)
- Rename 'Backside' -> 'Back' in context of drawing - showing 'Back'
  makes sense.

28 files changed, 477 insertions, 347 deletions

diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index a71987c20c5..dd0803a3a67 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -28,7 +28,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         280
-#define BLENDER_SUBVERSION      37
+#define BLENDER_SUBVERSION      38
 /* Several breakages with 280, e.g. collections vs layers */
 #define BLENDER_MINVERSION      280
 #define BLENDER_MINSUBVERSION   0
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index 2f198c5b565..9e4a7372010 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -503,7 +503,6 @@ void BKE_mesh_init(Mesh *me)
 	me->size[0] = me->size[1] = me->size[2] = 1.0;
 	me->smoothresh = DEG2RADF(30);
 	me->texflag = ME_AUTOSPACE;
-	me->drawflag = 0;
 
 	CustomData_reset(&me->vdata);
 	CustomData_reset(&me->edata);
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index cb5cb96acd3..56843899ff6 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -837,10 +837,6 @@ void BKE_object_init(Object *ob)
 	ob->empty_drawtype = OB_PLAINAXES;
 	ob->empty_drawsize = 1.0;
 	ob->empty_image_depth = OB_EMPTY_IMAGE_DEPTH_DEFAULT;
-	ob->empty_image_visibility_flag = (
-	        OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE |
-	        OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC |
-	        OB_EMPTY_IMAGE_VISIBLE_BACKSIDE);
 	if (ob->type == OB_EMPTY) {
 		copy_v2_fl(ob->ima_ofs, -0.5f);
 	}
@@ -2674,19 +2670,19 @@ void BKE_object_empty_draw_type_set(Object *ob, const int value)
 
 bool BKE_object_empty_image_is_visible_in_view3d(const Object *ob, const RegionView3D *rv3d)
 {
-	int visibility_flag = ob->empty_image_visibility_flag;
+	char visibility_flag = ob->empty_image_visibility_flag;
 
-	if ((visibility_flag & OB_EMPTY_IMAGE_VISIBLE_BACKSIDE) == 0) {
+	if ((visibility_flag & OB_EMPTY_IMAGE_HIDE_BACK) != 0) {
 		if (dot_v3v3((float *)&ob->obmat[2], (float *)&rv3d->viewinv[2]) < 0.0f) {
 			return false;
 		}
 	}
 
 	if (rv3d->is_persp) {
-		return visibility_flag & OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE;
+		return (visibility_flag & OB_EMPTY_IMAGE_HIDE_PERSPECTIVE) == 0;
 	}
 	else {
-		return visibility_flag & OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC;
+		return (visibility_flag & OB_EMPTY_IMAGE_HIDE_ORTHOGRAPHIC) == 0;
 	}
 }
 
diff --git a/source/blender/blenloader/intern/versioning_250.c b/source/blender/blenloader/intern/versioning_250.c
index 54e1512c953..4f2417c21d2 100644
--- a/source/blender/blenloader/intern/versioning_250.c
+++ b/source/blender/blenloader/intern/versioning_250.c
@@ -694,6 +694,7 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 
 		/* and composite trees */
 		for (sce = bmain->scene.first; sce; sce = sce->id.next) {
+			enum { R_PANORAMA = (1 << 10) };
 			if (sce->nodetree && sce->nodetree->id.name[0] == '\0')
 				strcpy(sce->nodetree->id.name, "NTCompositing Nodetree");
 
@@ -727,13 +728,6 @@ void blo_do_versions_250(FileData *fd, Library *lib, Main *bmain)
 			}
 		}
 
-#if 0 /* ME_DRAWEDGES and others was moved to viewport. */
-		/* copy standard draw flag to meshes(used to be global, is not available here) */
-		for (me = bmain->mesh.first; me; me = me->id.next) {
-			me->drawflag = ME_DRAWEDGES | ME_DRAWFACES | ME_DRAWCREASES;
-		}
-#endif
-
 		/* particle draw and render types */
 		for (part = bmain->particle.first; part; part = part->id.next) {
 			if (part->draw_as) {
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index 217720caada..65133954359 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -767,7 +767,6 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
 	if (bmain->versionfile < 260 || (bmain->versionfile == 260 && bmain->subversionfile < 6)) {
 		Scene *sce;
 		MovieClip *clip;
-		bScreen *sc;
 
 		for (sce = bmain->scene.first; sce; sce = sce->id.next) {
 			do_versions_image_settings_2_60(sce);
@@ -784,19 +783,6 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			}
 		}
 
-		for (sc = bmain->screen.first; sc; sc = sc->id.next) {
-			ScrArea *sa;
-			for (sa = sc->areabase.first; sa; sa = sa->next) {
-				SpaceLink *sl;
-				for (sl = sa->spacedata.first; sl; sl = sl->next) {
-					if (sl->spacetype == SPACE_VIEW3D) {
-						View3D *v3d = (View3D *)sl;
-						v3d->flag2 &= ~V3D_RENDER_SHADOW;
-					}
-				}
-			}
-		}
-
 		{
 			Object *ob;
 			for (ob = bmain->object.first; ob; ob = ob->id.next) {
@@ -1726,6 +1712,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
 			SEQ_BEGIN (scene->ed, seq)
 			{
+				enum { SEQ_MAKE_PREMUL = (1 << 6) };
 				if (seq->flag & SEQ_MAKE_PREMUL) {
 					seq->alpha_mode = SEQ_ALPHA_STRAIGHT;
 				}
@@ -2411,6 +2398,11 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			Sculpt *sd = scene->toolsettings->sculpt;
 
 			if (sd) {
+				enum {
+					SCULPT_SYMM_X = (1 << 0),
+					SCULPT_SYMM_Y = (1 << 1),
+					SCULPT_SYMM_Z = (1 << 2),
+				};
 				int symmetry_flags = sd->flags & 7;
 
 				if (symmetry_flags & SCULPT_SYMM_X)
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 5a1002702b3..ba13445f2f3 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1796,6 +1796,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 				for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 					for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 						if (sl->spacetype == SPACE_VIEW3D) {
+							enum { V3D_SHOW_MODE_SHADE_OVERRIDE = (1 << 15), };
 							View3D *v3d = (View3D *)sl;
 							float alpha = v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE ? 0.0f : 0.8f;
 							float alpha_full = v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE ? 0.0f : 1.0f;
@@ -2181,6 +2182,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 				for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 					if (sl->spacetype == SPACE_VIEW3D) {
+						enum { V3D_OCCLUDE_WIRE = (1 << 14) };
 						View3D *v3d = (View3D *)sl;
 						if (v3d->flag2 & V3D_OCCLUDE_WIRE) {
 							v3d->overlay.edit_flag |= V3D_OVERLAY_EDIT_OCCLUDE_WIRE;
@@ -2230,15 +2232,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 				}
 			}
 		}
-
-		for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
-			ob->empty_image_visibility_flag = (
-			        OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE |
-			        OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC |
-			        OB_EMPTY_IMAGE_VISIBLE_BACKSIDE);
-		}
-
-
 	}
 
 	if (!MAIN_VERSION_ATLEAST(bmain, 280, 30)) {
@@ -2533,6 +2526,214 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 		}
 	}
 
+
+	if (!MAIN_VERSION_ATLEAST(bmain, 280, 38)) {
+		if (DNA_struct_elem_find(fd->filesdna, "Object", "char", "empty_image_visibility_flag")) {
+			for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
+				ob->empty_image_visibility_flag ^= (
+				        OB_EMPTY_IMAGE_HIDE_PERSPECTIVE |
+				        OB_EMPTY_IMAGE_HIDE_ORTHOGRAPHIC |
+				        OB_EMPTY_IMAGE_HIDE_BACK);
+			}
+		}
+
+		for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
+			for (ScrArea *area = screen->areabase.first; area; area = area->next) {
+				for (SpaceLink *sl = area->spacedata.first; sl; sl = sl->next) {
+					switch (sl->spacetype) {
+						case SPACE_IMAGE:
+						{
+							SpaceImage *sima = (SpaceImage *)sl;
+							sima->flag &= ~(
+							        SI_FLAG_DEPRECATED_0 |
+							        SI_FLAG_DEPRECATED_1 |
+							        SI_FLAG_DEPRECATED_3 |
+							        SI_FLAG_DEPRECATED_6 |
+							        SI_FLAG_DEPRECATED_7 |
+							        SI_FLAG_DEPRECATED_8 |
+							        SI_FLAG_DEPRECATED_17 |
+							        SI_FLAG_DEPRECATED_18 |
+							        SI_FLAG_DEPRECATED_23 |
+							        SI_FLAG_DEPRECATED_24);
+							break;
+						}
+						case SPACE_VIEW3D:
+						{
+							View3D *v3d = (View3D *)sl;
+							v3d->flag &= ~(
+							        V3D_FLAG_DEPRECATED_0 |
+							        V3D_FLAG_DEPRECATED_1 |
+							        V3D_FLAG_DEPRECATED_10 |
+							        V3D_FLAG_DEPRECATED_12);
+							v3d->flag2 &= ~(
+							        V3D_FLAG2_DEPRECATED_3 |
+							        V3D_FLAG2_DEPRECATED_6 |
+							        V3D_FLAG2_DEPRECATED_12 |
+							        V3D_FLAG2_DEPRECATED_13 |
+							        V3D_FLAG2_DEPRECATED_14 |
+							        V3D_FLAG2_DEPRECATED_15);
+							break;
+						}
+						case SPACE_OUTLINER:
+						{
+							SpaceOops *so = (SpaceOops *)sl;
+							so->filter &= ~(
+							        SO_FILTER_DEPRECATED_1 |
+							        SO_FILTER_DEPRECATED_5 |
+							        SO_FILTER_DEPRECATED_12);
+							so->storeflag &= ~(
+							        SO_TREESTORE_DEPRECATED_1);
+							break;
+						}
+						case SPACE_FILE:
+						{
+							SpaceFile *sfile = (SpaceFile *)sl;
+							if (sfile->params) {
+								sfile->params->flag &= ~(
+								        FILE_PARAMS_FLAG_DEPRECATED_1 |
+								        FILE_PARAMS_FLAG_DEPRECATED_6 |
+								        FILE_PARAMS_FLAG_DEPRECATED_9);
+							}
+							break;
+						}
+						case SPACE_NODE:
+						{
+							SpaceNode *snode = (SpaceNode *)sl;
+							snode->flag &= ~(
+							        SNODE_FLAG_DEPRECATED_6 |
+							        SNODE_FLAG_DEPRECATED_10 |
+							        SNODE_FLAG_DEPRECATED_11);
+							break;
+						}
+						case SPACE_BUTS:
+						{
+							SpaceButs *sbuts = (SpaceButs *)sl;
+							sbuts->flag &= ~(
+							        SB_FLAG_DEPRECATED_2 |
+							        SB_FLAG_DEPRECATED_3);
+							break;
+						}
+						case SPACE_NLA:
+						{
+							SpaceNla *snla = (SpaceNla *)sl;
+							snla->flag &= ~(
+							        SNLA_FLAG_DEPRECATED_0 |
+							        SNLA_FLAG_DEPRECATED_1 |
+							        SNLA_FLAG_DEPRECATED_3);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+			scene->r.mode &= ~(
+			        R_MODE_DEPRECATED_1 |
+			        R_MODE_DEPRECATED_2 |
+			        R_MODE_DEPRECATED_3 |
+			        R_MODE_DEPRECATED_4 |
+			        R_MODE_DEPRECATED_5 |
+			        R_MODE_DEPRECATED_6 |
+			        R_MODE_DEPRECATED_7 |
+			        R_MODE_DEPRECATED_8 |
+			        R_MODE_DEPRECATED_10 |
+			        R_MODE_DEPRECATED_13 |
+			        R_MODE_DEPRECATED_16 |
+			        R_MODE_DEPRECATED_17 |
+			        R_MODE_DEPRECATED_18 |
+			        R_MODE_DEPRECATED_19 |
+			        R_MODE_DEPRECATED_20 |
+			        R_MODE_DEPRECATED_21 |
+			        R_MODE_DEPRECATED_27);
+
+			scene->r.scemode &= ~(
+			        R_SCEMODE_DEPRECATED_8 |
+			        R_SCEMODE_DEPRECATED_11 |
+			        R_SCEMODE_DEPRECATED_13 |
+			        R_SCEMODE_DEPRECATED_16 |
+			        R_SCEMODE_DEPRECATED_17 |
+			        R_SCEMODE_DEPRECATED_19);
+
+			if (scene->toolsettings->sculpt) {
+				scene->toolsettings->sculpt->flags &= ~(
+				        SCULPT_FLAG_DEPRECATED_0 |
+				        SCULPT_FLAG_DEPRECATED_1 |
+				        SCULPT_FLAG_DEPRECATED_2);
+			}
+
+			if (scene->ed) {
+				Sequence *seq;
+				SEQ_BEGIN (scene->ed, seq)
+				{
+					seq->flag &= ~(
+					        SEQ_FLAG_DEPRECATED_6 |
+					        SEQ_FLAG_DEPRECATED_18 |
+					        SEQ_FLAG_DEPRECATED_19 |
+					        SEQ_FLAG_DEPRECATED_21);
+					if (seq->type == SEQ_TYPE_SPEED) {
+						SpeedControlVars *s = (SpeedControlVars *)seq->effectdata;
+						s->flags &= ~(
+						        SEQ_SPEED_DEPRECATED_1);
+					}
+				} SEQ_END;
+			}
+		}
+
+		for (World *world = bmain->world.first; world; world = world->id.next) {
+			world->flag &= ~(
+			        WO_MODE_DEPRECATED_1 |
+			        WO_MODE_DEPRECATED_2 |
+			        WO_MODE_DEPRECATED_3 |
+			        WO_MODE_DEPRECATED_4 |
+			        WO_MODE_DEPRECATED_5 |
+			        WO_MODE_DEPRECATED_7);
+		}
+
+		for (Image *image = bmain->image.first; image; image = image->id.next) {
+			image->flag &= ~(
+			        IMA_FLAG_DEPRECATED_0 |
+			        IMA_FLAG_DEPRECATED_1 |
+			        IMA_FLAG_DEPRECATED_4 |
+			        IMA_FLAG_DEPRECATED_6 |
+			        IMA_FLAG_DEPRECATED_8 |
+			        IMA_FLAG_DEPRECATED_15 |
+			        IMA_FLAG_DEPRECATED_16);
+			image->tpageflag &= ~(
+			        IMA_TPAGEFLAG_DEPRECATED_0 |
+			        IMA_TPAGEFLAG_DEPRECATED_1 |
+			        IMA_TPAGEFLAG_DEPRECATED_2 |
+			        IMA_TPAGEFLAG_DEPRECATED_4 |
+			        IMA_TPAGEFLAG_DEPRECATED_5);
+		}
+
+		for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
+			ob->flag &= ~(
+			        OB_FLAG_DEPRECATED_11 |
+			        OB_FLAG_DEPRECATED_12);
+			ob->transflag &= ~(
+			        OB_TRANSFLAG_DEPRECATED_0 |
+			        OB_TRANSFLAG_DEPRECATED_1);
+			ob->shapeflag &= ~OB_SHAPE_FLAG_DEPRECATED_1;
+		}
+
+		for (Mesh *me = bmain->mesh.first; me; me = me->id.next) {
+			me->flag &= ~(
+			        ME_FLAG_DEPRECATED_0 |
+			        ME_FLAG_DEPRECATED_1 |
+			        ME_FLAG_DEPRECATED_3 |
+			        ME_FLAG_DEPRECATED_4 |
+			        ME_FLAG_DEPRECATED_6 |
+			        ME_FLAG_DEPRECATED_7 |
+			        ME_FLAG_DEPRECATED_8);
+		}
+
+		for (Material *mat = bmain->mat.first; mat; mat = mat->id.next) {
+			mat->blend_flag &= (
+			        MA_BL_FLAG_DEPRECATED_2);
+		}
+	}
+
 	{
 		/* Versioning code until next subversion bump goes here. */
 
diff --git a/source/blender/blenloader/intern/versioning_legacy.c b/source/blender/blenloader/intern/versioning_legacy.c
index 3b4e35149aa..6f1954b7e62 100644
--- a/source/blender/blenloader/intern/versioning_legacy.c
+++ b/source/blender/blenloader/intern/versioning_legacy.c
@@ -799,6 +799,10 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 		 * takes a lot more work to calculate.
 		 */
 		for (me = bmain->mesh.first; me; me = me->id.next) {
+			enum {
+				ME_SMESH = (1 << 6),
+				ME_SUBSURF = (1 << 7),
+			};
 			if (me->flag & ME_SMESH) {
 				me->flag &= ~ME_SMESH;
 				me->flag |= ME_SUBSURF;
@@ -871,8 +875,10 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 		}
 		/* Make sure that old subsurf meshes don't have zero subdivision level for rendering */
 		for (me = bmain->mesh.first; me; me = me->id.next) {
-			if ((me->flag & ME_SUBSURF) && (me->subdivr == 0))
+			enum { ME_SUBSURF = (1 << 7) };
+			if ((me->flag & ME_SUBSURF) && (me->subdivr == 0)) {
 				me->subdivr = me->subdiv;
+			}
 		}
 
 		for (sce = bmain->scene.first; sce; sce = sce->id.next) {
@@ -1222,11 +1228,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 			for (sa = sc->areabase.first; sa; sa = sa->next) {
 				SpaceLink *sl;
 				for (sl = sa->spacedata.first; sl; sl = sl->next) {
-					if (sl->spacetype == SPACE_VIEW3D) {
-						View3D *v3d = (View3D *)sl;
-						v3d->flag |= V3D_ZBUF_SELECT;
-					}
-					else if (sl->spacetype == SPACE_TEXT) {
+					if (sl->spacetype == SPACE_TEXT) {
 						SpaceText *st = (SpaceText *)sl;
 						if (st->tabnumber == 0)
 							st->tabnumber = 2;
@@ -1337,6 +1339,11 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 			else if (ob->type == OB_MESH) {
 				Mesh *me = blo_do_versions_newlibadr(fd, lib, ob->data);
 
+				enum {
+					ME_SUBSURF = (1 << 7),
+					ME_OPT_EDGES = (1 << 8),
+				};
+
 				if ((me->flag & ME_SUBSURF)) {
 					SubsurfModifierData *smd = (SubsurfModifierData *)modifier_new(eModifierType_Subsurf);
 
@@ -1349,6 +1356,7 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 						smd->modifier.mode |= 1;
 					if (me->subdivr != 0)
 						smd->modifier.mode |= 2;
+
 					if (me->flag & ME_OPT_EDGES)
 						smd->flags |= eSubsurfModifierFlag_ControlEdges;
 
@@ -1650,9 +1658,11 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 		}
 
 		for (sce = bmain->scene.first; sce; sce = sce->id.next) {
+			enum {
+				R_THREADS = (1 << 19),
+			};
 			if (sce->toolsettings->select_thresh == 0.0f)
 				sce->toolsettings->select_thresh = 0.01f;
-
 			if (sce->r.threads == 0) {
 				if (sce->r.mode & R_THREADS)
 					sce->r.threads = 2;
@@ -1810,15 +1820,21 @@ void blo_do_versions_pre250(FileData *fd, Library *lib, Main *bmain)
 
 			}
 			for (tex = bmain->tex.first; tex; tex = tex->id.next) {
+				enum {
+					TEX_ANIMCYCLIC = (1 << 6),
+					TEX_ANIM5 = (1 << 7),
+				};
+
 				if (tex->type == TEX_IMAGE && tex->ima) {
 					ima = blo_do_versions_newlibadr(fd, lib, tex->ima);
-					if (tex->imaflag & TEX_ANIM5_)
+					if (tex->imaflag & TEX_ANIM5) {
 						ima->source = IMA_SRC_MOVIE;
+					}
 				}
 				tex->iuser.frames = tex->frames;
 				tex->iuser.offset = tex->offset;
 				tex->iuser.sfra = tex->sfra;
-				tex->iuser.cycl = (tex->imaflag & TEX_ANIMCYCLIC_) != 0;
+				tex->iuser.cycl = (tex->imaflag & TEX_ANIMCYCLIC) != 0;
 			}
 			for (sce = bmain->scene.first; sce; sce = sce->id.next) {
 				if (sce->nodetree)
diff --git a/source/blender/blenloader/intern/versioning_userdef.c b/source/blender/blenloader/intern/versioning_userdef.c
index e43ed4af437..049a0f02dec 100644
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@ -421,10 +421,8 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
 		userdef->flag &= ~USER_LMOUSESELECT;
 	}
 
-	/**
-	 * Include next version bump.
-	 */
-	{
+	if (!USER_VERSION_ATLEAST(280, 38)) {
+
 		/* (keep this block even if it becomes empty). */
 		copy_v4_fl4(userdef->light_param[0].vec, -0.580952, 0.228571, 0.781185, 0.0);
 		copy_v4_fl4(userdef->light_param[0].col, 0.900000, 0.900000, 0.900000, 1.000000);
@@ -451,6 +449,21 @@ void BLO_version_defaults_userpref_blend(Main *bmain, UserDef *userdef)
 		userdef->light_param[3].smooth = 0.7;
 
 		copy_v4_fl4(userdef->light_ambient, 0.025000, 0.025000, 0.025000, 1.000000);
+
+		userdef->flag &= (
+		        USER_FLAG_DEPRECATED_4);
+
+		userdef->uiflag &= (
+		        USER_UIFLAG_DEPRECATED_8 |
+		        USER_UIFLAG_DEPRECATED_12 |
+		        USER_UIFLAG_DEPRECATED_22);
+	}
+
+	/**
+	 * Include next version bump.
+	 */
+	{
+		/* (keep this block even if it becomes empty). */
 	}
 
 	if (userdef->pixelsize == 0.0f)
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c
index 6736d4c4110..12ca83e631a 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.c
+++ b/source/blender/draw/engines/eevee/eevee_materials.c
@@ -1387,7 +1387,7 @@ static void material_transparent(
 		DRW_shgroup_uniform_float(*shgrp, "roughness", rough_p, 1);
 	}
 
-	const bool use_prepass = ((ma->blend_flag & MA_BL_HIDE_BACKSIDE) != 0);
+	const bool use_prepass = ((ma->blend_flag & MA_BL_HIDE_BACKFACE) != 0);
 
 	DRWState all_state = (
 	        DRW_STATE_WRITE_DEPTH | DRW_STATE_WRITE_COLOR | DRW_STATE_CULL_BACK |
@@ -1442,14 +1442,10 @@ void EEVEE_materials_cache_populate(EEVEE_Data *vedata, EEVEE_ViewLayerData *sld
 	const bool do_cull = (draw_ctx->v3d && (draw_ctx->v3d->flag2 & V3D_BACKFACE_CULLING));
 	const bool is_active = (ob == draw_ctx->obact);
 	const bool is_sculpt_mode = is_active && (draw_ctx->object_mode & OB_MODE_SCULPT) != 0;
-#if 0
-	const bool is_sculpt_mode_draw = is_sculpt_mode && (draw_ctx->v3d->flag2 & V3D_SHOW_MODE_SHADE_OVERRIDE) == 0;
-#else
 	/* For now just force fully shaded with eevee when supported. */
 	const bool is_sculpt_mode_draw =
 	        is_sculpt_mode &&
 	        ((ob->sculpt && ob->sculpt->pbvh) && (BKE_pbvh_type(ob->sculpt->pbvh) != PBVH_FACES));
-#endif
 	const bool use_hide = is_active && DRW_object_use_hide_faces(ob);
 	const bool is_default_mode_shader = is_sculpt_mode;
 
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 0e9c2cf3759..4989d4e9ab9 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -454,8 +454,7 @@ enum {
 
 	/* Only works with ED_view3d_draw_offscreen_imbuf_simple(). */
 	V3D_OFSDRAW_USE_GPENCIL      = (1 << 1),
-	V3D_OFSDRAW_USE_SOLID_TEX    = (1 << 2),
-	V3D_OFSDRAW_USE_CAMERA_DOF   = (1 << 3),
+	V3D_OFSDRAW_USE_CAMERA_DOF   = (1 << 2),
 };
 
 struct ImBuf *ED_view3d_draw_offscreen_imbuf(
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index bb574874cad..409f0300530 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -73,16 +73,10 @@ static bool check_ob_drawface_dot(Scene *sce, View3D *vd, char dt)
 	if (G.f & G_BACKBUFSEL)
 		return false;
 
-	if ((vd->flag & V3D_ZBUF_SELECT) == 0)
-		return true;
-
 	/* if its drawing textures with zbuf sel, then don't draw dots */
 	if (dt == OB_TEXTURE && vd->shading.type == OB_TEXTURE)
 		return false;
 
-	if ((vd->shading.type >= OB_SOLID) && (vd->flag2 & V3D_SOLID_TEX))
-		return false;
-
 	return true;
 }
 
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 05debeef88d..9fee8f38533 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1424,7 +1424,7 @@ void ED_view3d_draw_offscreen(
 	/* set flags */
 	G.f |= G_RENDER_OGL;
 
-	if ((v3d->flag2 & V3D_RENDER_SHADOW) == 0) {
+	{
 		/* free images which can have changed on frame-change
 		 * warning! can be slow so only free animated images - campbell */
 		GPU_free_images_anim(G.main);  /* XXX :((( */
@@ -1679,9 +1679,6 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(
 	if (draw_flags & V3D_OFSDRAW_USE_GPENCIL) {
 		v3d.flag2 |= V3D_SHOW_ANNOTATION;
 	}
-	if (draw_flags & V3D_OFSDRAW_USE_SOLID_TEX) {
-		v3d.flag2 |= V3D_SOLID_TEX;
-	}
 
 	v3d.shading.background_type = V3D_SHADING_BACKGROUND_WORLD;
 
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index f51a46cd95f..c9a6a9d608b 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -893,9 +893,7 @@ CustomDataMask ED_view3d_datamask(const Scene *UNUSED(scene), const View3D *v3d)
 	CustomDataMask mask = 0;
 	const int drawtype = view3d_effective_drawtype(v3d);
 
-	if (ELEM(drawtype, OB_TEXTURE, OB_MATERIAL) ||
-	    ((drawtype == OB_SOLID) && (v3d->flag2 & V3D_SOLID_TEX)))
-	{
+	if (ELEM(drawtype, OB_TEXTURE, OB_MATERIAL)) {
 		mask |= CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL;
 
 		if (drawtype == OB_MATERIAL)
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index 22329661da2..37a0f65135b 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -157,35 +157,35 @@ typedef struct Image {
 
 /* Image.flag */
 enum {
-	// IMA_FIELDS              = (1 << 0),
-	// IMA_STD_FIELD           = (1 << 1),
+	IMA_FLAG_DEPRECATED_0   = (1 << 0),  /* cleared */
+	IMA_FLAG_DEPRECATED_1   = (1 << 1),  /* cleared */
 #ifdef DNA_DEPRECATED
-	IMA_DO_PREMUL           = (1 << 2),  /* deprecated, should not be used */
+	IMA_DO_PREMUL           = (1 << 2),
 #endif
-	//IMA_REFLECT             = (1 << 4), /* deprecated */
+	IMA_FLAG_DEPRECATED_4   = (1 << 4),  /* cleared */
 	IMA_NOCOLLECT           = (1 << 5),
-	//IMA_DONE_TAG          = (1 << 6),  // UNUSED
+	IMA_FLAG_DEPRECATED_6   = (1 << 6),  /* cleared */
 	IMA_OLD_PREMUL          = (1 << 7),
-	// IMA_CM_PREDIVIDE     = (1 << 8),  /* deprecated, should not be used */
+	IMA_FLAG_DEPRECATED_8   = (1 << 8),  /* cleared */
 	IMA_USED_FOR_RENDER     = (1 << 9),
 	IMA_USER_FRAME_IN_RANGE = (1 << 10), /* for image user, but these flags are mixed */
 	IMA_VIEW_AS_RENDER      = (1 << 11),
 	IMA_IGNORE_ALPHA        = (1 << 12),
 	IMA_DEINTERLACE         = (1 << 13),
 	IMA_USE_VIEWS           = (1 << 14),
-	// IMA_IS_STEREO        = (1 << 15), /* deprecated */
-	// IMA_IS_MULTIVIEW     = (1 << 16), /* deprecated */
+	IMA_FLAG_DEPRECATED_15  = (1 << 15),  /* cleared */
+	IMA_FLAG_DEPRECATED_16  = (1 << 16),  /* cleared */
 };
 
 /* Image.tpageflag */
-//#define IMA_TILES			(1 << 0) /* Deprecated */
-//#define IMA_TWINANIM		(1 << 1) /* Deprecated */
-#define IMA_COLCYCLE		(1 << 2)	/* Deprecated */
-#define IMA_MIPMAP_COMPLETE (1 << 3)   /* all mipmap levels in OpenGL texture set? */
-//#define IMA_CLAMP_U		(1 << 4) /* Deprecated */
-//#define IMA_CLAMP_V		(1 << 5) /* Deprecated */
-#define IMA_TPAGE_REFRESH	(1 << 6)
-#define IMA_GLBIND_IS_DATA	(1 << 7) /* opengl image texture bound as non-color data */
+#define IMA_TPAGEFLAG_DEPRECATED_0      (1 << 0)  /* cleared */
+#define IMA_TPAGEFLAG_DEPRECATED_1      (1 << 1)  /* cleared */
+#define IMA_TPAGEFLAG_DEPRECATED_2      (1 << 2)  /* cleared */
+#define IMA_MIPMAP_COMPLETE             (1 << 3)  /* all mipmap levels in OpenGL texture set? */
+#define IMA_TPAGEFLAG_DEPRECATED_4      (1 << 4)  /* cleared */
+#define IMA_TPAGEFLAG_DEPRECATED_5      (1 << 5)  /* cleared */
+#define IMA_TPAGE_REFRESH               (1 << 6)
+#define IMA_GLBIND_IS_DATA              (1 << 7) /* opengl image texture bound as non-color data */
 
 /* ima->type and ima->source moved to BKE_image.h, for API */
 
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 2de63f5d59f..312cb5396e1 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -274,9 +274,9 @@ enum {
 
 /* blend_flag */
 enum {
-	MA_BL_HIDE_BACKSIDE =        (1 << 0),
+	MA_BL_HIDE_BACKFACE =        (1 << 0),
 	MA_BL_SS_REFRACTION =        (1 << 1),
-	MA_BL_SS_SUBSURFACE =        (1 << 2), /* DEPRECATED */
+	MA_BL_FLAG_DEPRECATED_2 =    (1 << 2), /* cleared */
 	MA_BL_TRANSLUCENCY =         (1 << 3),
 };
 
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index fda18e5cbd6..9a91d3a0998 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -172,10 +172,8 @@ typedef struct Mesh {
 	float size[3];
 	float rot[3];
 
-	int drawflag;
 	short texflag, flag;
 	float smoothresh;
-	int pad2;
 
 	/* customdata flag, for bevel-weight and crease, which are now optional */
 	char cd_flag, pad;
@@ -230,15 +228,15 @@ enum {
 
 /* me->flag */
 enum {
-/*	ME_ISDONE                  = 1 << 0, */
-/*	ME_DEPRECATED              = 1 << 1, */
+	ME_FLAG_DEPRECATED_0       = 1 << 0,  /* cleared */
+	ME_FLAG_DEPRECATED_1       = 1 << 1,  /* cleared */
 	ME_TWOSIDED                = 1 << 2,
-	ME_UVEFFECT                = 1 << 3,
-	ME_VCOLEFFECT              = 1 << 4,
+	ME_FLAG_DEPRECATED_3       = 1 << 3,  /* cleared */
+	ME_FLAG_DEPRECATED_4       = 1 << 4,  /* cleared */
 	ME_AUTOSMOOTH              = 1 << 5,
-	ME_SMESH                   = 1 << 6,
-	ME_SUBSURF                 = 1 << 7,
-	ME_OPT_EDGES               = 1 << 8,
+	ME_FLAG_DEPRECATED_6       = 1 << 6,  /* cleared */
+	ME_FLAG_DEPRECATED_7       = 1 << 7,  /* cleared */
+	ME_FLAG_DEPRECATED_8       = 1 << 8,  /* cleared */
 	ME_DS_EXPAND               = 1 << 9,
 	ME_SCULPT_DYNAMIC_TOPOLOGY = 1 << 10,
 };
@@ -250,41 +248,6 @@ enum {
 	ME_CDFLAG_EDGE_CREASE  = 1 << 2,
 };
 
-#if 0 /* Was moved to overlay options for 2.8 */
-/* me->drawflag, short */
-enum {
-	ME_DRAWEDGES           = 1 << 0,
-	ME_DRAWFACES           = 1 << 1,
-	ME_DRAWNORMALS         = 1 << 2,
-	ME_DRAW_VNORMALS       = 1 << 3,
-
-	ME_DRAWEIGHT           = 1 << 4,
-	ME_DRAW_FACE_DOT       = 1 << 5,
-
-	ME_DRAWCREASES         = 1 << 6,
-	ME_DRAWSEAMS           = 1 << 7,
-	ME_DRAWSHARP           = 1 << 8,
-	ME_DRAWBWEIGHTS        = 1 << 9,
-
-	ME_DRAWEXTRA_EDGELEN   = 1 << 10,
-	ME_DRAWEXTRA_FACEAREA  = 1 << 11,
-	ME_DRAWEXTRA_FACEANG   = 1 << 12,
-	ME_DRAWEXTRA_EDGEANG   = 1 << 13,
-
-/* debug only option */
-	ME_DRAWEXTRA_INDICES   = 1 << 14,
-
-	ME_DRAW_FREESTYLE_EDGE = 1 << 15,
-	ME_DRAW_FREESTYLE_FACE = 1 << 16,
-
-/* draw stats */
-	ME_DRAW_STATVIS        = 1 << 17,
-
-/* draw loop normals */
-	ME_DRAW_LNORMALS       = 1 << 18,
-};
-#endif
-
 /* Subsurf Type */
 enum {
 	ME_CC_SUBSURF      = 0,
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 639b68b141d..16ca673c83b 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -421,8 +421,9 @@ enum {
 };
 
 /* (short) transflag */
-/* flags 1 and 2 were unused or relics from past features */
 enum {
+	OB_TRANSFLAG_DEPRECATED_0 = 1 << 0,
+	OB_TRANSFLAG_DEPRECATED_1 = 1 << 1,
 	OB_NEG_SCALE        = 1 << 2,
 	OB_DUPLIFRAMES      = 1 << 3,
 	OB_DUPLIVERTS       = 1 << 4,
@@ -537,8 +538,10 @@ enum {
 
 #define OB_FROMDUPLI        (1 << 9)
 #define OB_DONE             (1 << 10)  /* unknown state, clear before use */
-/* #define OB_RADIO            (1 << 11) */  /* deprecated */
-/* #define OB_FROMGROUP        (1 << 12) */  /* deprecated */
+#ifdef DNA_DEPRECATED_ALLOW
+#  define OB_FLAG_DEPRECATED_11        (1 << 11)  /* cleared */
+#  define OB_FLAG_DEPRECATED_12        (1 << 12)  /* cleared */
+#endif
 
 /* controller state */
 #define OB_MAX_STATES       30
@@ -556,7 +559,9 @@ enum {
 /* ob->shapeflag */
 enum {
 	OB_SHAPE_LOCK       = 1 << 0,
-	// OB_SHAPE_TEMPLOCK   = 1 << 1,  /* deprecated */
+#ifdef DNA_DEPRECATED_ALLOW
+	OB_SHAPE_FLAG_DEPRECATED_1   = 1 << 1,  /* cleared */
+#endif
 	OB_SHAPE_EDIT_MODE  = 1 << 2,
 };
 
@@ -604,11 +609,11 @@ enum {
 #define OB_EMPTY_IMAGE_DEPTH_FRONT 1
 #define OB_EMPTY_IMAGE_DEPTH_BACK 2
 
-/* ob->empty_image_visibility_flag */
+/** #Object.empty_image_visibility_flag */
 enum {
-	OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE  = 1 << 0,
-	OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC = 1 << 1,
-	OB_EMPTY_IMAGE_VISIBLE_BACKSIDE     = 1 << 2,
+	OB_EMPTY_IMAGE_HIDE_PERSPECTIVE  = 1 << 0,
+	OB_EMPTY_IMAGE_HIDE_ORTHOGRAPHIC = 1 << 1,
+	OB_EMPTY_IMAGE_HIDE_BACK         = 1 << 2,
 };
 
 #define MAX_DUPLI_RECUR 8
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index e800cc14afc..43f236cde1e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1624,41 +1624,37 @@ typedef struct Scene {
 #define SCER_SHOW_SUBFRAME	(1<<3)
 
 /* RenderData.mode */
-#define R_OSA           (1 << 0)
-/* #define R_SHADOW     (1 << 1) */
-/* #define R_GAMMA      (1 << 2) */
-/* #define R_ORTHO      (1 << 3) */
-/* #define R_ENVMAP     (1 << 4) */
-/* #define R_EDGE       (1 << 5) */
-/* #define R_FIELDS     (1 << 6) */
-/*#define R_FIELDSTILL  (1 << 7) */
-/*#define R_RADIO       (1 << 8) */ /* deprecated */
-#define R_BORDER        (1 << 9)
-#define R_PANORAMA      (1 << 10) /* deprecated */
-#define R_CROP          (1 << 11)
-		/* Disable camera switching: runtime (DURIAN_CAMERA_SWITCH) */
-#define R_NO_CAMERA_SWITCH  (1 << 12)
-/* #define R_ODDFIELD       (1 << 13) */
-#define R_MBLUR         (1 << 14)
+#define R_OSA                   (1 << 0)
+#define R_MODE_DEPRECATED_1     (1 << 1)  /* cleared */
+#define R_MODE_DEPRECATED_2     (1 << 2)  /* cleared */
+#define R_MODE_DEPRECATED_3     (1 << 3)  /* cleared */
+#define R_MODE_DEPRECATED_4     (1 << 4)  /* cleared */
+#define R_MODE_DEPRECATED_5     (1 << 5)  /* cleared */
+#define R_MODE_DEPRECATED_6     (1 << 6)  /* cleared */
+#define R_MODE_DEPRECATED_7     (1 << 7)  /* cleared */
+#define R_MODE_DEPRECATED_8     (1 << 8)  /* cleared */
+#define R_BORDER                (1 << 9)
+#define R_MODE_DEPRECATED_10    (1 << 10)  /* cleared */
+#define R_CROP                  (1 << 11)
+/* Disable camera switching: runtime (DURIAN_CAMERA_SWITCH) */
+#define R_NO_CAMERA_SWITCH      (1 << 12)
+#define R_MODE_DEPRECATED_13    (1 << 13)  /* cleared */
+#define R_MBLUR                 (1 << 14)
 		/* unified was here */
-/* #define R_RAYTRACE      (1 << 16) */
-		/* R_GAUSS is obsolete, but used to retrieve setting from old files */
-/* #define R_GAUSS          (1 << 17) */
-		/* fbuf obsolete... */
-/*#define R_FBUF            (1 << 18)*/
-		/* threads obsolete... is there for old files, now use for autodetect threads */
-#define R_THREADS       (1 << 19)
-		/* Use the same flag for autothreads */
-#define R_FIXED_THREADS     (1 << 19)
-
-/* #define R_SPEED              (1 << 20) */
-/* #define R_SSS                (1 << 21) */
-#define R_NO_OVERWRITE      (1 << 22)  /* skip existing files */
-#define R_TOUCH             (1 << 23)  /* touch files before rendering */
-#define R_SIMPLIFY          (1 << 24)
-#define R_EDGE_FRS          (1 << 25) /* R_EDGE reserved for Freestyle */
-#define R_PERSISTENT_DATA   (1 << 26) /* keep data around for re-render */
-/* #define R_USE_WS_SHADING (1 << 27) */ /* use world space interpretation of lighting data */
+#define R_MODE_DEPRECATED_16    (1 << 16)  /* cleared */
+#define R_MODE_DEPRECATED_17    (1 << 17)  /* cleared */
+#define R_MODE_DEPRECATED_18    (1 << 18)  /* cleared */
+#define R_MODE_DEPRECATED_19    (1 << 19)  /* cleared */
+#define R_FIXED_THREADS         (1 << 19)
+
+#define R_MODE_DEPRECATED_20    (1 << 20)  /* cleared */
+#define R_MODE_DEPRECATED_21    (1 << 21)  /* cleared */
+#define R_NO_OVERWRITE          (1 << 22)  /* skip existing files */
+#define R_TOUCH                 (1 << 23)  /* touch files before rendering */
+#define R_SIMPLIFY              (1 << 24)
+#define R_EDGE_FRS              (1 << 25) /* R_EDGE reserved for Freestyle */
+#define R_PERSISTENT_DATA       (1 << 26) /* keep data around for re-render */
+#define R_MODE_DEPRECATED_27    (1 << 27)  /* cleared */
 
 /* RenderData.seq_flag */
 enum {
@@ -1685,30 +1681,30 @@ enum {
 #define R_FILTER_MITCH	6
 #define R_FILTER_FAST_GAUSS	7
 
-/* RenderData.scemode (int now) */
-#define R_DOSEQ             (1 << 0)
-#define R_BG_RENDER         (1 << 1)
+/* RenderData.scemode */
+#define R_DOSEQ                 (1 << 0)
+#define R_BG_RENDER             (1 << 1)
 		/* passepartout is camera option now, keep this for backward compatibility */
-#define R_PASSEPARTOUT		(1 << 2)
-#define R_BUTS_PREVIEW		(1 << 3)
-#define R_EXTENSION			(1 << 4)
-#define R_MATNODE_PREVIEW	(1 << 5)
-#define R_DOCOMP			(1 << 6)
-#define R_COMP_CROP			(1 << 7)
-/* #define R_FREE_IMAGE		(1 << 8) */
-#define R_SINGLE_LAYER		(1 << 9)
-#define R_EXR_TILE_FILE		(1 << 10)
-/* #define R_COMP_FREE			(1 << 11) */
-#define R_NO_IMAGE_LOAD		(1 << 12)
-/* #define R_NO_TEX			(1 << 13) */
-#define R_NO_FRAME_UPDATE	(1 << 14)
-#define R_FULL_SAMPLE		(1 << 15)
-/* #define R_DEPRECATED		(1 << 16) */
-/* #define R_RECURS_PROTECTION	(1 << 17) */
-#define R_TEXNODE_PREVIEW	(1 << 18)
-/* #define R_VIEWPORT_PREVIEW	(1 << 19) */
-#define R_EXR_CACHE_FILE	(1 << 20)
-#define R_MULTIVIEW			(1 << 21)
+#define R_PASSEPARTOUT          (1 << 2)
+#define R_BUTS_PREVIEW          (1 << 3)
+#define R_EXTENSION             (1 << 4)
+#define R_MATNODE_PREVIEW       (1 << 5)
+#define R_DOCOMP                (1 << 6)
+#define R_COMP_CROP             (1 << 7)
+#define R_SCEMODE_DEPRECATED_8  (1 << 8)  /* cleared */
+#define R_SINGLE_LAYER          (1 << 9)
+#define R_EXR_TILE_FILE         (1 << 10)
+#define R_SCEMODE_DEPRECATED_11 (1 << 11)  /* cleared */
+#define R_NO_IMAGE_LOAD         (1 << 12)
+#define R_SCEMODE_DEPRECATED_13 (1 << 13)  /* cleared */
+#define R_NO_FRAME_UPDATE       (1 << 14)
+#define R_FULL_SAMPLE           (1 << 15)
+#define R_SCEMODE_DEPRECATED_16 (1 << 16)  /* cleared */
+#define R_SCEMODE_DEPRECATED_17 (1 << 17)  /* cleared */
+#define R_TEXNODE_PREVIEW       (1 << 18)
+#define R_SCEMODE_DEPRECATED_19 (1 << 19)  /* cleared */
+#define R_EXR_CACHE_FILE        (1 << 20)
+#define R_MULTIVIEW             (1 << 21)
 
 /* RenderData.stamp */
 #define R_STAMP_TIME 	(1 << 0)
@@ -2031,16 +2027,14 @@ typedef enum ePaintSymmetryFlags {
 /* Sculpt.flags */
 /* These can eventually be moved to paint flags? */
 typedef enum eSculptFlags {
-#ifdef DNA_DEPRECATED
-	/* deprecated, part of paint struct symmetry_flags now */
-	SCULPT_SYMM_X = (1 << 0),
-	SCULPT_SYMM_Y = (1 << 1),
-	SCULPT_SYMM_Z = (1 << 2),
-#endif
+	SCULPT_FLAG_DEPRECATED_0 = (1 << 0),  /* cleared */
+	SCULPT_FLAG_DEPRECATED_1 = (1 << 1),  /* cleared */
+	SCULPT_FLAG_DEPRECATED_2 = (1 << 2),  /* cleared */
 
 	SCULPT_LOCK_X = (1 << 3),
 	SCULPT_LOCK_Y = (1 << 4),
 	SCULPT_LOCK_Z = (1 << 5),
+
 	/* deprecated, part of paint struct symmetry_flags now */
 	SCULPT_SYMMETRY_FEATHER = (1 << 6),
 
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 2e6aa25ad9b..f44c9675e86 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -399,23 +399,22 @@ typedef struct SequencerScopes {
 #define SEQ_EDIT_PROXY_DIR_STORAGE 1
 
 /* SpeedControlVars->flags */
-#define SEQ_SPEED_INTEGRATE      1
-/* #define SEQ_SPEED_BLEND          2 */ /* DEPRECATED */
-#define SEQ_SPEED_COMPRESS_IPO_Y 4
+#define SEQ_SPEED_INTEGRATE      (1 << 0)
+#define SEQ_SPEED_DEPRECATED_1   (1 << 1)  /* cleared */
+#define SEQ_SPEED_COMPRESS_IPO_Y (1 << 2)
 
 /* ***************** SEQUENCE ****************** */
 #define SEQ_NAME_MAXSTR         64
 
 /* seq->flag */
 enum {
+	/* SELECT */
 	SEQ_LEFTSEL                 = (1 << 1),
 	SEQ_RIGHTSEL                = (1 << 2),
 	SEQ_OVERLAP                 = (1 << 3),
 	SEQ_FILTERY                 = (1 << 4),
 	SEQ_MUTE                    = (1 << 5),
-#ifdef DNA_DEPRECATED
-	SEQ_MAKE_PREMUL             = (1 << 6), /* deprecated, used for compatibility code only */
-#endif
+	SEQ_FLAG_DEPRECATED_6       = (1 << 6),  /* cleared */
 	SEQ_REVERSE_FRAMES          = (1 << 7),
 	SEQ_IPO_FRAME_LOCKED        = (1 << 8),
 	SEQ_EFFECT_NOT_LOADED       = (1 << 9),
@@ -427,10 +426,10 @@ enum {
 	SEQ_USE_PROXY               = (1 << 15),
 	SEQ_USE_TRANSFORM           = (1 << 16),
 	SEQ_USE_CROP                = (1 << 17),
-	/* SEQ_USE_COLOR_BALANCE       = (1 << 18), */ /* DEPRECATED */
-	/* SEQ_USE_PROXY_CUSTOM_DIR    = (1 << 19), */ /* DEPRECATED */
+	SEQ_FLAG_DEPRECATED_18      = (1 << 18),  /* cleared */
+	SEQ_FLAG_DEPRECATED_19      = (1 << 19),  /* cleared */
+	SEQ_FLAG_DEPRECATED_21      = (1 << 21),  /* cleared */
 
-	/* SEQ_USE_PROXY_CUSTOM_FILE   = (1 << 21), */ /* DEPRECATED */
 	SEQ_USE_EFFECT_DEFAULT_FADE = (1 << 22),
 	SEQ_USE_LINEAR_MODIFIERS    = (1 << 23),
 
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index fd977a7dafb..ca89cf11441 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -208,8 +208,8 @@ typedef enum eSpaceButtons_Context {
 typedef enum eSpaceButtons_Flag {
 	SB_PRV_OSA = (1 << 0),
 	SB_PIN_CONTEXT = (1 << 1),
-	/* SB_WORLD_TEX = (1 << 2), */ /* not used anymore */
-	/* SB_BRUSH_TEX = (1 << 3), */ /* not used anymore */
+	SB_FLAG_DEPRECATED_2 = (1 << 2),
+	SB_FLAG_DEPRECATED_3 = (1 << 3),
 	SB_TEX_USER_LIMITED = (1 << 3), /* Do not add materials, particles, etc. in TemplateTextureUser list. */
 	SB_SHADING_CONTEXT = (1 << 4),
 } eSpaceButtons_Flag;
@@ -267,13 +267,13 @@ typedef enum eSpaceOutliner_Flag {
 
 /* SpaceOops.filter */
 typedef enum eSpaceOutliner_Filter {
-	SO_FILTER_SEARCH           = (1 << 0), /* Run-time flag. */
-	/* SO_FILTER_ENABLE           = (1 << 1), */ /* Deprecated */
+	SO_FILTER_SEARCH           = (1 << 0),  /* Run-time flag. */
+	SO_FILTER_DEPRECATED_1     = (1 << 1),  /* cleared */
 	SO_FILTER_NO_OBJECT        = (1 << 2),
 	SO_FILTER_NO_OB_CONTENT    = (1 << 3), /* Not only mesh, but modifiers, constraints, ... */
 	SO_FILTER_NO_CHILDREN      = (1 << 4),
 
-	/* SO_FILTER_OB_TYPE          = (1 << 5), */ /* Deprecated */
+	SO_FILTER_DEPRECATED_5     = (1 << 5),  /* cleared */
 	SO_FILTER_NO_OB_MESH       = (1 << 6),
 	SO_FILTER_NO_OB_ARMATURE   = (1 << 7),
 	SO_FILTER_NO_OB_EMPTY      = (1 << 8),
@@ -281,7 +281,7 @@ typedef enum eSpaceOutliner_Filter {
 	SO_FILTER_NO_OB_CAMERA     = (1 << 10),
 	SO_FILTER_NO_OB_OTHERS     = (1 << 11),
 
-	/* SO_FILTER_OB_STATE          = (1 << 12), */ /* Deprecated */
+	SO_FILTER_DEPRECATED_12     = (1 << 12),  /* cleared */
 	SO_FILTER_OB_STATE_VISIBLE  = (1 << 13), /* Not set via DNA. */
 	SO_FILTER_OB_STATE_SELECTED = (1 << 14), /* Not set via DNA. */
 	SO_FILTER_OB_STATE_ACTIVE   = (1 << 15), /* Not set via DNA. */
@@ -339,7 +339,7 @@ typedef enum eSpaceOutliner_Mode {
 typedef enum eSpaceOutliner_StoreFlag {
 	/* cleanup tree */
 	SO_TREESTORE_CLEANUP    = (1 << 0),
-	/* SO_TREESTORE_REDRAW     = (1 << 1), */ /* Deprecated */
+	SO_TREESTORE_DEPRECATED_1 = (1 << 1),  /* cleared */
 	/* rebuild the tree, similar to cleanup,
 	 * but defer a call to BKE_outliner_treehash_rebuild_from_treestore instead */
 	SO_TREESTORE_REBUILD    = (1 << 2),
@@ -467,10 +467,11 @@ typedef struct SpaceNla {
 
 /* SpaceNla.flag */
 typedef enum eSpaceNla_Flag {
-	/* flags (1<<0), (1<<1), and (1<<3) are deprecated flags from old versions */
-
+	SNLA_FLAG_DEPRECATED_0 = (1 << 0),
+	SNLA_FLAG_DEPRECATED_1 = (1 << 1),
 	/* draw timing in seconds instead of frames */
 	SNLA_DRAWTIME          = (1 << 2),
+	SNLA_FLAG_DEPRECATED_3 = (1 << 3),
 	/* don't draw frame number beside frame indicator */
 	SNLA_NODRAWCFRANUM     = (1 << 4),
 	/* don't draw influence curves on strips */
@@ -729,24 +730,23 @@ typedef enum eFileSel_Action {
 	FILE_SAVE = 1,
 } eFileSel_Action;
 
-/* sfile->params->flag and simasel->flag */
+/* sfile->params->flag */
 /* Note: short flag, also used as 16 lower bits of flags in link/append code
  *       (WM and BLO code area, see BLO_LibLinkFlags in BLO_readfile.h). */
 typedef enum eFileSel_Params_Flag {
-	FILE_SHOWSHORT      = (1 << 0),
-	FILE_RELPATH        = (1 << 1), /* was FILE_STRINGCODE */
-	FILE_LINK           = (1 << 2),
-	FILE_HIDE_DOT       = (1 << 3),
-	FILE_AUTOSELECT     = (1 << 4),
-	FILE_ACTIVE_COLLECTION = (1 << 5),
-/*  FILE_ATCURSOR       = (1 << 6), */ /* deprecated */
-	FILE_DIRSEL_ONLY    = (1 << 7),
-	FILE_FILTER         = (1 << 8),
-	FILE_BOOKMARKS      = (1 << 9),
-	FILE_GROUP_INSTANCE = (1 << 10),
+	FILE_PARAMS_FLAG_DEPRECATED_1   = (1 << 0),  /* cleared */
+	FILE_RELPATH                    = (1 << 1),
+	FILE_LINK                       = (1 << 2),
+	FILE_HIDE_DOT                   = (1 << 3),
+	FILE_AUTOSELECT                 = (1 << 4),
+	FILE_ACTIVE_COLLECTION          = (1 << 5),
+	FILE_PARAMS_FLAG_DEPRECATED_6	= (1 << 6),  /* cleared */
+	FILE_DIRSEL_ONLY                = (1 << 7),
+	FILE_FILTER                     = (1 << 8),
+	FILE_PARAMS_FLAG_DEPRECATED_9   = (1 << 9),  /* cleared */
+	FILE_GROUP_INSTANCE             = (1 << 10),
 } eFileSel_Params_Flag;
 
-
 /* files in filesel list: file types
  * Note we could use mere values (instead of bitflags) for file types themselves,
  * but since we do not lack of bytes currently...
@@ -975,15 +975,15 @@ typedef enum eSpaceImage_Sticky {
 
 /* SpaceImage.flag */
 typedef enum eSpaceImage_Flag {
-/*	SI_BE_SQUARE          = (1 << 0), */  /* deprecated */
-/*	SI_EDITTILE           = (1 << 1), */  /* deprecated */
+	SI_FLAG_DEPRECATED_0  = (1 << 0),  /* cleared */
+	SI_FLAG_DEPRECATED_1  = (1 << 1),  /* cleared */
 	SI_CLIP_UV            = (1 << 2),
-/*	SI_DRAWTOOL           = (1 << 3), */  /* deprecated */
+	SI_FLAG_DEPRECATED_3  = (1 << 3),  /* cleared */
 	SI_NO_DRAWFACES       = (1 << 4),
 	SI_DRAWSHADOW         = (1 << 5),
-/*	SI_SELACTFACE         = (1 << 6), */  /* deprecated */
-/*	SI_DEPRECATED2        = (1 << 7), */  /* deprecated */
-/*	SI_DEPRECATED3        = (1 << 8), */  /* deprecated */
+	SI_FLAG_DEPRECATED_6  = (1 << 6),  /* cleared */
+	SI_FLAG_DEPRECATED_7  = (1 << 7),  /* cleared */
+	SI_FLAG_DEPRECATED_8  = (1 << 8),  /* cleared */
 	SI_COORDFLOATS        = (1 << 9),
 	SI_PIXELSNAP          = (1 << 10),
 	SI_LIVE_UNWRAP        = (1 << 11),
@@ -995,8 +995,8 @@ typedef enum eSpaceImage_Flag {
 	SI_PREVSPACE          = (1 << 15),
 	SI_FULLWINDOW         = (1 << 16),
 
-/*	SI_DEPRECATED4        = (1 << 17), */  /* deprecated */
-/*	SI_DEPRECATED5        = (1 << 18), */  /* deprecated */
+	SI_FLAG_DEPRECATED_17 = (1 << 17),  /* cleared */
+	SI_FLAG_DEPRECATED_18 = (1 << 18),  /* cleared */
 
 	/* this means that the image is drawn until it reaches the view edge,
 	 * in the image view, it's unrelated to the 'tile' mode for texface
@@ -1005,9 +1005,9 @@ typedef enum eSpaceImage_Flag {
 	SI_SMOOTH_UV          = (1 << 20),
 	SI_DRAW_STRETCH       = (1 << 21),
 	SI_SHOW_GPENCIL       = (1 << 22),
-/*	SI_DEPRECATED6        = (1 << 23), */  /* deprecated */
+	SI_FLAG_DEPRECATED_23 = (1 << 23),  /* cleared */
 
-	SI_COLOR_CORRECTION   = (1 << 24),
+	SI_FLAG_DEPRECATED_24 = (1 << 24),
 
 	SI_NO_DRAW_TEXPAINT   = (1 << 25),
 	SI_DRAW_METADATA      = (1 << 26),
@@ -1205,9 +1205,9 @@ typedef enum eSpaceNode_Flag {
 	SNODE_SHOW_G         = (1 << 8),
 	SNODE_SHOW_B         = (1 << 9),
 	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), DNA_DEPRECATED
+	SNODE_FLAG_DEPRECATED_6  = (1 << 6),   /* cleared */
+	SNODE_FLAG_DEPRECATED_10 = (1 << 10),  /* cleared */
+	SNODE_FLAG_DEPRECATED_11 = (1 << 11),  /* cleared */
 	SNODE_PIN            = (1 << 12),
 	SNODE_SKIP_INSOFFSET = (1 << 13), /* automatically offset following nodes in a chain on insertion */
 } eSpaceNode_Flag;
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 7f9993a9c78..8442634ef6f 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -317,16 +317,6 @@ typedef struct ColorMapping {
 #define TXF_FELINE		2
 #define TXF_AREA		3
 
-/* imaflag unused, only for version check */
-#ifdef DNA_DEPRECATED_ALLOW
-// #define TEX_FIELDS_      (1 << 3)
-#define TEX_ANIMCYCLIC_     (1 << 6)
-#define TEX_ANIM5_          (1 << 7)
-#define TEX_ANTIALI_        (1 << 8)
-#define TEX_ANTISCALE_      (1 << 9)
-#define TEX_STD_FIELD_      (1 << 10)
-#endif
-
 /* flag */
 #define TEX_COLORBAND       (1 << 0)
 #define TEX_FLIPBLEND       (1 << 1)
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 929cb5b36a9..056b7be511e 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -721,7 +721,7 @@ typedef enum eUserPref_Flag {
 	USER_FLAG_NUMINPUT_ADVANCED = (1 << 1),
 	USER_FLAG_DEPRECATED_2	= (1 << 2),  /* cleared */
 	USER_FLAG_DEPRECATED_3	= (1 << 3),  /* cleared */
-/*	USER_SCENEGLOBAL         = (1 << 4), deprecated */
+	USER_FLAG_DEPRECATED_4  = (1 << 4),  /* cleared */
 	USER_TRACKBALL			= (1 << 5),
 	USER_FLAG_DEPRECATED_6	= (1 << 6),  /* cleared */
 	USER_FLAG_DEPRECATED_7	= (1 << 7),  /* cleared */
@@ -779,36 +779,36 @@ typedef enum eWalkNavigation_Flag {
 /* UserDef.uiflag */
 typedef enum eUserpref_UI_Flag {
 	/* flags 0 and 1 were old flags (for autokeying) that aren't used anymore */
-	USER_WHEELZOOMDIR		= (1 << 2),
-	USER_FILTERFILEEXTS		= (1 << 3),
-	USER_DRAWVIEWINFO		= (1 << 4),
-	USER_PLAINMENUS			= (1 << 5),
-	USER_LOCK_CURSOR_ADJUST	= (1 << 6),
-	USER_HEADER_BOTTOM		= (1 << 7),
-	USER_ALLWINCODECS		= (1 << 8),
-	USER_MENUOPENAUTO		= (1 << 9),
-	USER_DEPTH_CURSOR		= (1 << 10),
-	USER_AUTOPERSP     		= (1 << 11),
-	/* USER_LOCKAROUND     	= (1 << 12), */  /* DEPRECATED */
-	USER_GLOBALUNDO     	= (1 << 13),
-	USER_ORBIT_SELECTION	= (1 << 14),
-	USER_DEPTH_NAVIGATE     = (1 << 15),
-	USER_HIDE_DOT			= (1 << 16),
-	USER_SHOW_GIZMO_AXIS	= (1 << 17),
-	USER_SHOW_VIEWPORTNAME	= (1 << 18),
-	USER_CAM_LOCK_NO_PARENT	= (1 << 19),
-	USER_ZOOM_TO_MOUSEPOS	= (1 << 20),
-	USER_SHOW_FPS			= (1 << 21),
-	USER_MMB_PASTE			= (1 << 22),
-	USER_MENUFIXEDORDER		= (1 << 23),
-	USER_CONTINUOUS_MOUSE	= (1 << 24),
-	USER_ZOOM_INVERT		= (1 << 25),
-	USER_ZOOM_HORIZ			= (1 << 26), /* for CONTINUE and DOLLY zoom */
-	USER_SPLASH_DISABLE		= (1 << 27),
-	USER_HIDE_RECENT		= (1 << 28),
-	USER_SHOW_THUMBNAILS	= (1 << 29),
-	USER_QUIT_PROMPT		= (1 << 30),
-	USER_HIDE_SYSTEM_BOOKMARKS = (1u << 31)
+	USER_WHEELZOOMDIR           = (1 << 2),
+	USER_FILTERFILEEXTS         = (1 << 3),
+	USER_DRAWVIEWINFO           = (1 << 4),
+	USER_PLAINMENUS             = (1 << 5),
+	USER_LOCK_CURSOR_ADJUST     = (1 << 6),
+	USER_HEADER_BOTTOM          = (1 << 7),
+	USER_UIFLAG_DEPRECATED_8    = (1 << 8),  /* cleared */
+	USER_MENUOPENAUTO           = (1 << 9),
+	USER_DEPTH_CURSOR           = (1 << 10),
+	USER_AUTOPERSP              = (1 << 11),
+	USER_UIFLAG_DEPRECATED_12   = (1 << 12),  /* cleared */
+	USER_GLOBALUNDO             = (1 << 13),
+	USER_ORBIT_SELECTION        = (1 << 14),
+	USER_DEPTH_NAVIGATE         = (1 << 15),
+	USER_HIDE_DOT               = (1 << 16),
+	USER_SHOW_GIZMO_AXIS        = (1 << 17),
+	USER_SHOW_VIEWPORTNAME      = (1 << 18),
+	USER_CAM_LOCK_NO_PARENT     = (1 << 19),
+	USER_ZOOM_TO_MOUSEPOS       = (1 << 20),
+	USER_SHOW_FPS               = (1 << 21),
+	USER_UIFLAG_DEPRECATED_22   = (1 << 22),  /* cleared */
+	USER_MENUFIXEDORDER         = (1 << 23),
+	USER_CONTINUOUS_MOUSE       = (1 << 24),
+	USER_ZOOM_INVERT            = (1 << 25),
+	USER_ZOOM_HORIZ             = (1 << 26), /* for CONTINUE and DOLLY zoom */
+	USER_SPLASH_DISABLE         = (1 << 27),
+	USER_HIDE_RECENT            = (1 << 28),
+	USER_SHOW_THUMBNAILS        = (1 << 29),
+	USER_QUIT_PROMPT            = (1 << 30),
+	USER_HIDE_SYSTEM_BOOKMARKS  = (1u << 31)
 } eUserpref_UI_Flag;
 
 /* UserDef.uiflag2 */
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index c402192c02a..242be7b75cc 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -301,21 +301,21 @@ typedef struct View3D {
 
 
 /* View3D->stereo_flag (short) */
-#define V3D_S3D_DISPCAMERAS		(1 << 0)
-#define V3D_S3D_DISPPLANE		(1 << 1)
-#define V3D_S3D_DISPVOLUME		(1 << 2)
+#define V3D_S3D_DISPCAMERAS     (1 << 0)
+#define V3D_S3D_DISPPLANE       (1 << 1)
+#define V3D_S3D_DISPVOLUME      (1 << 2)
 
 /* View3D->flag (short) */
-/*#define V3D_FLAG_DEPRECATED_1 (1 << 0) */ /*UNUSED */
-/*#define V3D_FLAG_DEPRECATED_2 (1 << 1) */ /* UNUSED */
-#define V3D_HIDE_HELPLINES  (1 << 2)
-#define V3D_INVALID_BACKBUF (1 << 3)
+#define V3D_FLAG_DEPRECATED_0   (1 << 0)  /* cleared */
+#define V3D_FLAG_DEPRECATED_1   (1 << 1)  /* cleared */
+#define V3D_HIDE_HELPLINES      (1 << 2)
+#define V3D_INVALID_BACKBUF     (1 << 3)
 
-/* #define V3D_FLAG_DEPRECATED_10 (1 << 10) */ /* UNUSED */
-#define V3D_SELECT_OUTLINE  (1 << 11)
-#define V3D_ZBUF_SELECT     (1 << 12)   /* XXX: DNA deprecated */
-#define V3D_GLOBAL_STATS    (1 << 13)
-#define V3D_DRAW_CENTERS    (1 << 15)
+#define V3D_FLAG_DEPRECATED_10  (1 << 10)  /* cleared */
+#define V3D_SELECT_OUTLINE      (1 << 11)
+#define V3D_FLAG_DEPRECATED_12  (1 << 12)  /* cleared */
+#define V3D_GLOBAL_STATS        (1 << 13)
+#define V3D_DRAW_CENTERS        (1 << 15)
 
 /* RegionView3d->persp */
 #define RV3D_ORTHO				0
@@ -354,20 +354,20 @@ typedef struct View3D {
 	(((view) >= RV3D_VIEW_FRONT) && ((view) <= RV3D_VIEW_BOTTOM))
 
 /* View3d->flag2 (int) */
-#define V3D_RENDER_OVERRIDE		(1 << 2)
-#define V3D_SOLID_TEX			(1 << 3)
+#define V3D_RENDER_OVERRIDE     (1 << 2)
+#define V3D_FLAG2_DEPRECATED_3  (1 << 3)   /* cleared */
 #define V3D_SHOW_ANNOTATION     (1 << 4)
-#define V3D_LOCK_CAMERA			(1 << 5)
-#define V3D_RENDER_SHADOW		(1 << 6)		/* This is a runtime only flag that's used to tell draw_mesh_object() that we're doing a shadow pass instead of a regular draw */
-#define V3D_SHOW_RECONSTRUCTION	(1 << 7)
-#define V3D_SHOW_CAMERAPATH		(1 << 8)
-#define V3D_SHOW_BUNDLENAME		(1 << 9)
-#define V3D_BACKFACE_CULLING	(1 << 10)
-#define V3D_RENDER_BORDER		(1 << 11)
-#define V3D_SOLID_MATCAP		(1 << 12)	/* user flag */
-#define V3D_SHOW_SOLID_MATCAP	(1 << 13)	/* runtime flag */
-#define V3D_OCCLUDE_WIRE		(1 << 14)   /* XXX: DNA deprecated */
-#define V3D_SHOW_MODE_SHADE_OVERRIDE (1 << 15) /* XXX: DNA deprecated */
+#define V3D_LOCK_CAMERA         (1 << 5)
+#define V3D_FLAG2_DEPRECATED_6  (1 << 6)   /* cleared */
+#define V3D_SHOW_RECONSTRUCTION (1 << 7)
+#define V3D_SHOW_CAMERAPATH     (1 << 8)
+#define V3D_SHOW_BUNDLENAME     (1 << 9)
+#define V3D_BACKFACE_CULLING    (1 << 10)
+#define V3D_RENDER_BORDER       (1 << 11)
+#define V3D_FLAG2_DEPRECATED_12 (1 << 12)  /* cleared */
+#define V3D_FLAG2_DEPRECATED_13 (1 << 13)  /* cleared */
+#define V3D_FLAG2_DEPRECATED_14 (1 << 14)  /* cleared */
+#define V3D_FLAG2_DEPRECATED_15 (1 << 15)  /* cleared */
 
 /* View3d->gp_flag (short) */
 #define V3D_GP_SHOW_PAPER            (1 << 0) /* Activate paper to cover all viewport */
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 82ebef4b978..a3cc65d3c79 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -97,14 +97,14 @@ typedef struct World {
 /* **************** WORLD ********************* */
 
 /* mode */
-#define WO_MIST                (1 << 0)
-//#define WO_STARS               (1 << 1) /* deprecated */
-/*#define WO_DOF                 (1 << 2)*/
-//#define WO_ACTIVITY_CULLING      (1 << 3) /* deprecated */
-//#define WO_ENV_LIGHT            (1 << 4)
-//#define WO_DBVT_CULLING         (1 << 5) /* deprecated */
-#define WO_AMB_OCC            (1 << 6)
-//#define WO_INDIRECT_LIGHT   (1 << 7)
+#define WO_MIST                   (1 << 0)
+#define WO_MODE_DEPRECATED_1      (1 << 1)  /* cleared */
+#define WO_MODE_DEPRECATED_2      (1 << 2)  /* cleared */
+#define WO_MODE_DEPRECATED_3      (1 << 3)  /* cleared */
+#define WO_MODE_DEPRECATED_4      (1 << 4)  /* cleared */
+#define WO_MODE_DEPRECATED_5      (1 << 5)  /* cleared */
+#define WO_AMB_OCC                (1 << 6)
+#define WO_MODE_DEPRECATED_7      (1 << 7)  /* cleared */
 
 enum {
 	WO_MIST_QUADRATIC          = 0,
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index fb7c0be7c77..a5b02db6a28 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -710,9 +710,9 @@ void RNA_def_material(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Clip Threshold", "A pixel is rendered only if its alpha value is above this threshold");
 	RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
-	prop = RNA_def_property(srna, "show_transparent_backside", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "blend_flag", MA_BL_HIDE_BACKSIDE);
-	RNA_def_property_ui_text(prop, "Show Backside", "Limit transparency to a single layer "
+	prop = RNA_def_property(srna, "show_transparent_back", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "blend_flag", MA_BL_HIDE_BACKFACE);
+	RNA_def_property_ui_text(prop, "Show Backface", "Limit transparency to a single layer "
 	                                                 "(avoids transparency sorting problems)");
 	RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 390a80ce551..7fde114ca54 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2502,17 +2502,17 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
 
 	prop = RNA_def_property(srna, "show_empty_image_perspective", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_VISIBLE_PERSPECTIVE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_HIDE_PERSPECTIVE);
 	RNA_def_property_ui_text(prop, "Display in Perspective Mode", "Display image in perspective mode");
 	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
 
 	prop = RNA_def_property(srna, "show_empty_image_orthographic", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_VISIBLE_ORTHOGRAPHIC);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_HIDE_ORTHOGRAPHIC);
 	RNA_def_property_ui_text(prop, "Display in Orthographic Mode", "Display image in orthographic mode");
 	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
 
-	prop = RNA_def_property(srna, "show_empty_image_backside", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_VISIBLE_BACKSIDE);
+	prop = RNA_def_property(srna, "show_empty_image_back", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_negative_sdna(prop, NULL, "empty_image_visibility_flag", OB_EMPTY_IMAGE_HIDE_BACK);
 	RNA_def_property_ui_text(prop, "Display Back Side", "Display empty image even when viewed from the back");
 	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index abbd65808cf..f3d2d5d805e 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -3156,11 +3156,6 @@ static void rna_def_space_view3d(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Clip End", "3D View far clipping distance");
 	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
 
-	prop = RNA_def_property(srna, "show_textured_solid", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_SOLID_TEX);
-	RNA_def_property_ui_text(prop, "Textured Solid", "Display face-assigned textures in solid view");
-	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
-
 	prop = RNA_def_property(srna, "lock_camera", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag2", V3D_LOCK_CAMERA);
 	RNA_def_property_ui_text(prop, "Lock Camera to View", "Enable view navigation within the camera view");
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 24e6424effd..3025bc091f1 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4407,11 +4407,6 @@ static void rna_def_userdef_system(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Color Picker Type", "Different styles of displaying the color picker widget");
 	RNA_def_property_update(prop, 0, "rna_userdef_update");
 
-	prop = RNA_def_property(srna, "use_preview_images", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ALLWINCODECS);
-	RNA_def_property_ui_text(prop, "Enable All Codecs",
-	                         "Allow user to choose any codec (Windows only, might generate instability)");
-
 	prop = RNA_def_property(srna, "use_scripts_auto_execute", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_SCRIPT_AUTOEXEC_DISABLE);
 	RNA_def_property_ui_text(prop, "Auto Run Python Scripts",
@@ -4805,12 +4800,6 @@ static void rna_def_userdef_input(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_NONUMPAD);
 	RNA_def_property_ui_text(prop, "Emulate Numpad", "Main 1 to 0 keys act as the numpad ones (useful for laptops)");
 
-	/* middle mouse button */
-	prop = RNA_def_property(srna, "use_mouse_mmb_paste", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MMB_PASTE);
-	RNA_def_property_ui_text(prop, "Middle Mouse Paste",
-	                         "In text window, paste with middle mouse button instead of panning");
-
 	prop = RNA_def_property(srna, "invert_zoom_wheel", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_WHEELZOOMDIR);
 	RNA_def_property_ui_text(prop, "Wheel Invert Zoom", "Swap the Mouse Wheel zoom direction");